diff options
| author | Andrew Ardill <andrew.ardill@gmail.com> | 2011-01-18 10:48:02 +1100 |
|---|---|---|
| committer | Andrew Ardill <andrew.ardill@gmail.com> | 2011-01-18 13:49:33 +1100 |
| commit | ddc30dd6e3da3fa4a5b27b40ba0d15854e6fb12e (patch) | |
| tree | 1911963a01bb3ed4702a00c66d470316ad2e7a92 /src/main/java/net/minecraft/server/EntityPlayer.java | |
| parent | 8088a329cd53228bd7f82bc6c03bc0c88be4a3d3 (diff) | |
| download | craftbukkit-ddc30dd6e3da3fa4a5b27b40ba0d15854e6fb12e.tar craftbukkit-ddc30dd6e3da3fa4a5b27b40ba0d15854e6fb12e.tar.gz craftbukkit-ddc30dd6e3da3fa4a5b27b40ba0d15854e6fb12e.tar.lz craftbukkit-ddc30dd6e3da3fa4a5b27b40ba0d15854e6fb12e.tar.xz craftbukkit-ddc30dd6e3da3fa4a5b27b40ba0d15854e6fb12e.zip | |
Fixing some entity damage events
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityPlayer.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityPlayer.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java index 39b6eef2..99a18914 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -8,6 +8,7 @@ import org.bukkit.craftbukkit.CraftServer; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageEvent; // CraftBukkit end +import org.bukkit.event.entity.EntityDamageEvent.DamageCause; public abstract class EntityPlayer extends EntityLiving { @@ -340,8 +341,12 @@ public abstract class EntityPlayer extends EntityLiving { // CraftBukkit start if(entity instanceof EntityLiving) { CraftServer server = ((WorldServer) l).getServer(); - - EntityDamageByEntityEvent edbee = new EntityDamageByEntityEvent(entity.getBukkitEntity(), this.getBukkitEntity(), EntityDamageEvent.DamageCause.ENTITY_ATTACK, i); + org.bukkit.entity.Entity damager = this.getBukkitEntity(); + org.bukkit.entity.Entity damagee = entity.getBukkitEntity(); + DamageCause damageType = EntityDamageEvent.DamageCause.ENTITY_ATTACK; + int damageDone = i; + + EntityDamageByEntityEvent edbee = new EntityDamageByEntityEvent(damager, damagee, damageType, damageDone); server.getPluginManager().callEvent(edbee); if (!edbee.isCancelled()){ |