diff options
| author | Andrew Ardill <andrew.ardill@gmail.com> | 2011-01-17 08:53:42 +0800 |
|---|---|---|
| committer | Dinner Bone <dinnerbone@dinnerbone.com> | 2011-01-18 00:13:32 +0800 |
| commit | 5f2c8108b776ab5710adfe597574fb0b7e929e36 (patch) | |
| tree | c519cb90c2b68c53f0851ac82771d111602a3f79 /src/main/java/net/minecraft/server/EntityPlayer.java | |
| parent | 3400eafaf1ba56b43dbdbb9e0aac3ebf5930538b (diff) | |
| download | craftbukkit-5f2c8108b776ab5710adfe597574fb0b7e929e36.tar craftbukkit-5f2c8108b776ab5710adfe597574fb0b7e929e36.tar.gz craftbukkit-5f2c8108b776ab5710adfe597574fb0b7e929e36.tar.lz craftbukkit-5f2c8108b776ab5710adfe597574fb0b7e929e36.tar.xz craftbukkit-5f2c8108b776ab5710adfe597574fb0b7e929e36.zip | |
Updates to all Entities to use getBukkitEntity() any time an event is
raised.
Similar update to CraftVehicle and CraftLivingEntity
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityPlayer.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityPlayer.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java index 3314d431..0505a863 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -342,10 +342,8 @@ public abstract class EntityPlayer extends EntityLiving { // CraftBukkit start if(entity instanceof EntityLiving) { CraftServer server = ((WorldServer) l).getServer(); - CraftEntity damagee = new CraftLivingEntity(server, (EntityLiving) entity); - CraftEntity damager = new CraftLivingEntity(server, this); - EntityDamageByEntityEvent edbee = new EntityDamageByEntityEvent(damager, damagee, EntityDamageEvent.DamageCause.ENTITY_ATTACK, i); + EntityDamageByEntityEvent edbee = new EntityDamageByEntityEvent(entity.getBukkitEntity(), this.getBukkitEntity(), EntityDamageEvent.DamageCause.ENTITY_ATTACK, i); server.getPluginManager().callEvent(edbee); if (!edbee.isCancelled()){ |