diff options
author | sunkid <sunkid@iminurnetz.com> | 2011-12-27 10:56:46 -0800 |
---|---|---|
committer | Erik Broes <erikbroes@grum.nl> | 2011-12-27 20:21:28 +0100 |
commit | 066a95769c3905308060641cd08a25b19748b45f (patch) | |
tree | d27a1ae2cf8c3cb87ab49742b9b746fa07a32d4f /src/main/java/net/minecraft/server/EntityHuman.java | |
parent | 5adcf526abc83be8658adea02c4140b1edf401a2 (diff) | |
download | craftbukkit-066a95769c3905308060641cd08a25b19748b45f.tar craftbukkit-066a95769c3905308060641cd08a25b19748b45f.tar.gz craftbukkit-066a95769c3905308060641cd08a25b19748b45f.tar.lz craftbukkit-066a95769c3905308060641cd08a25b19748b45f.tar.xz craftbukkit-066a95769c3905308060641cd08a25b19748b45f.zip |
fixed double firing of EntityDamageByEntityEvent
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityHuman.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityHuman.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java index 29297677..24221ada 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -587,7 +587,9 @@ public abstract class EntityHuman extends EntityLiving { // also damage the player in this way. For example, EntitySlime. // We handle projectiles in their individual classes! - if (!(entity.getBukkitEntity() instanceof Projectile)) { + boolean isProjectile = damagesource instanceof EntityDamageSourceIndirect && ((EntityDamageSourceIndirect) damagesource).getProximateDamageSource().getBukkitEntity() instanceof Projectile; + + if (!isProjectile) { org.bukkit.entity.Entity damager = ((Entity) entity1).getBukkitEntity(); org.bukkit.entity.Entity damagee = this.getBukkitEntity(); |