diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityPlayer.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityPlayer.java | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java index e3925116..5c36727d 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1,17 +1,19 @@ package net.minecraft.server; -import java.lang.reflect.Type; -import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Set; + +// CraftBukkit start +import java.util.ArrayList; import org.bukkit.Server; import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.craftbukkit.entity.CraftEntity; import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.event.Event; import org.bukkit.event.entity.EntityDeathEvent; +// CraftBukkit end public class EntityPlayer extends EntityHuman implements ICrafting { @@ -86,7 +88,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } public void a(Entity entity) { - // Craftbukkit start + // CraftBukkit start List<org.bukkit.inventory.ItemStack> loot = new ArrayList<org.bukkit.inventory.ItemStack>(); for (int i = 0; i < inventory.a.length; ++i) { @@ -101,16 +103,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } } - CraftEntity ent = (CraftEntity)getBukkitEntity(); - EntityDeathEvent event = new EntityDeathEvent(Event.Type.ENTITY_DEATH, ent, loot); - CraftWorld cworld = ((WorldServer)world).getWorld(); - Server server = ((WorldServer)world).getServer(); + CraftEntity craftEntity = (CraftEntity) getBukkitEntity(); + CraftWorld cworld = ((WorldServer) world).getWorld(); + Server server = ((WorldServer) world).getServer(); + + EntityDeathEvent event = new EntityDeathEvent(Event.Type.ENTITY_DEATH, craftEntity, loot); server.getPluginManager().callEvent(event); - for (org.bukkit.inventory.ItemStack stack : event.getDrops()) { - cworld.dropItemNaturally(ent.getLocation(), stack); + for (org.bukkit.inventory.ItemStack stack: event.getDrops()) { + cworld.dropItemNaturally(craftEntity.getLocation(), stack); } - // Craftbukkit end + // CraftBukkit end } public boolean a(Entity entity, int i) { |