diff options
author | Erik Broes <erikbroes@grum.nl> | 2011-02-23 13:56:36 +0100 |
---|---|---|
committer | Erik Broes <erikbroes@grum.nl> | 2011-02-23 14:12:33 +0100 |
commit | 09aa37fe4a126c5fc2e557ae5b68bb58cd0a3059 (patch) | |
tree | 4d813de09480cee3083997ee192c3c9b9e35e863 /src/main/java/net/minecraft/server/EntitySkeleton.java | |
parent | 332d9c4f1884a03152c11ccb0b63c2e3127618ea (diff) | |
download | craftbukkit-09aa37fe4a126c5fc2e557ae5b68bb58cd0a3059.tar craftbukkit-09aa37fe4a126c5fc2e557ae5b68bb58cd0a3059.tar.gz craftbukkit-09aa37fe4a126c5fc2e557ae5b68bb58cd0a3059.tar.lz craftbukkit-09aa37fe4a126c5fc2e557ae5b68bb58cd0a3059.tar.xz craftbukkit-09aa37fe4a126c5fc2e557ae5b68bb58cd0a3059.zip |
Generic code cleanup
Diffstat (limited to 'src/main/java/net/minecraft/server/EntitySkeleton.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntitySkeleton.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/main/java/net/minecraft/server/EntitySkeleton.java b/src/main/java/net/minecraft/server/EntitySkeleton.java index 998d21a3..b0c62ea2 100644 --- a/src/main/java/net/minecraft/server/EntitySkeleton.java +++ b/src/main/java/net/minecraft/server/EntitySkeleton.java @@ -42,8 +42,10 @@ public class EntitySkeleton extends EntityMonster { CraftServer server = ((WorldServer) this.world).getServer(); Type eventType = Type.ENTITY_COMBUST; org.bukkit.entity.Entity entity = this.getBukkitEntity(); + EntityCombustEvent event = new EntityCombustEvent(eventType, entity); server.getPluginManager().callEvent(event); + if (!event.isCancelled()) { this.fireTicks = 300; } @@ -90,7 +92,7 @@ public class EntitySkeleton extends EntityMonster { } protected void o() { - // Craftbukkit start - whole method + // CraftBukkit start - whole method List<org.bukkit.inventory.ItemStack> loot = new ArrayList<org.bukkit.inventory.ItemStack>(); int count = this.random.nextInt(3); @@ -103,15 +105,16 @@ public class EntitySkeleton extends EntityMonster { loot.add(new org.bukkit.inventory.ItemStack(org.bukkit.Material.BONE, count)); } - CraftEntity entity = (CraftEntity)getBukkitEntity(); + CraftWorld cworld = ((WorldServer) world).getWorld(); + Server server = ((WorldServer) world).getServer(); + CraftEntity entity = (CraftEntity) getBukkitEntity(); + EntityDeathEvent event = new EntityDeathEvent(Type.ENTITY_DEATH, entity, loot); - CraftWorld cworld = ((WorldServer)world).getWorld(); - Server server = ((WorldServer)world).getServer(); server.getPluginManager().callEvent(event); - for (org.bukkit.inventory.ItemStack stack : event.getDrops()) { + for (org.bukkit.inventory.ItemStack stack: event.getDrops()) { cworld.dropItemNaturally(entity.getLocation(), stack); } - // Craftbukkit end + // CraftBukkit end } } |