From e24b10dfd9d3b716b3c11ce46efd8caf54d52694 Mon Sep 17 00:00:00 2001 From: Erik Broes Date: Sat, 26 Mar 2011 22:32:56 +0100 Subject: Updated for the cleanups done in Bukkit --- src/main/java/net/minecraft/server/EntitySkeleton.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/main/java/net/minecraft/server/EntitySkeleton.java') diff --git a/src/main/java/net/minecraft/server/EntitySkeleton.java b/src/main/java/net/minecraft/server/EntitySkeleton.java index b0c62ea2..945368e0 100644 --- a/src/main/java/net/minecraft/server/EntitySkeleton.java +++ b/src/main/java/net/minecraft/server/EntitySkeleton.java @@ -7,7 +7,6 @@ import org.bukkit.Server; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.craftbukkit.entity.CraftEntity; -import org.bukkit.event.Event.Type; import org.bukkit.event.entity.EntityCombustEvent; import org.bukkit.event.entity.EntityDeathEvent; // CraftBukkit end @@ -40,10 +39,9 @@ public class EntitySkeleton extends EntityMonster { if (f > 0.5F && this.world.i(MathHelper.b(this.locX), MathHelper.b(this.locY), MathHelper.b(this.locZ)) && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F) { // CraftBukkit start CraftServer server = ((WorldServer) this.world).getServer(); - Type eventType = Type.ENTITY_COMBUST; org.bukkit.entity.Entity entity = this.getBukkitEntity(); - EntityCombustEvent event = new EntityCombustEvent(eventType, entity); + EntityCombustEvent event = new EntityCombustEvent(entity); server.getPluginManager().callEvent(event); if (!event.isCancelled()) { @@ -109,7 +107,7 @@ public class EntitySkeleton extends EntityMonster { Server server = ((WorldServer) world).getServer(); CraftEntity entity = (CraftEntity) getBukkitEntity(); - EntityDeathEvent event = new EntityDeathEvent(Type.ENTITY_DEATH, entity, loot); + EntityDeathEvent event = new EntityDeathEvent(entity, loot); server.getPluginManager().callEvent(event); for (org.bukkit.inventory.ItemStack stack: event.getDrops()) { -- cgit v1.2.3