diff options
author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-09-21 15:41:24 +0100 |
---|---|---|
committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-09-21 15:41:24 +0100 |
commit | 20ddc944bb38b96ac5deb742126c53b9989b5c31 (patch) | |
tree | cf8cef5a55f609417a756d34a7b09034d48b69e9 /src/main/java/net/minecraft/server/EntitySquid.java | |
parent | 751ab82be07aec65151d7a0a76b90d8fc12974f6 (diff) | |
download | craftbukkit-20ddc944bb38b96ac5deb742126c53b9989b5c31.tar craftbukkit-20ddc944bb38b96ac5deb742126c53b9989b5c31.tar.gz craftbukkit-20ddc944bb38b96ac5deb742126c53b9989b5c31.tar.lz craftbukkit-20ddc944bb38b96ac5deb742126c53b9989b5c31.tar.xz craftbukkit-20ddc944bb38b96ac5deb742126c53b9989b5c31.zip |
Refactored a bunch of death code into the event factory
Diffstat (limited to 'src/main/java/net/minecraft/server/EntitySquid.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntitySquid.java | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java index d9eed62b..f4396701 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -1,6 +1,6 @@ package net.minecraft.server; -import org.bukkit.event.entity.EntityDeathEvent; // CraftBukkit +import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit public class EntitySquid extends EntityWaterAnimal { @@ -63,15 +63,7 @@ public class EntitySquid extends EntityWaterAnimal { loot.add(new org.bukkit.inventory.ItemStack(org.bukkit.Material.INK_SACK, count)); } - org.bukkit.World bworld = this.world.getWorld(); - org.bukkit.entity.Entity entity = this.getBukkitEntity(); - - EntityDeathEvent event = new EntityDeathEvent(entity, loot); - this.world.getServer().getPluginManager().callEvent(event); - - for (org.bukkit.inventory.ItemStack stack : event.getDrops()) { - bworld.dropItemNaturally(entity.getLocation(), stack); - } + CraftEventFactory.callEntityDeathEvent(this, loot); // CraftBukkit end } |