From fa6fd24f2a83c32c160dd8e88015b00d36a98547 Mon Sep 17 00:00:00 2001 From: Feildmaster Date: Wed, 8 Feb 2012 23:23:47 -0600 Subject: [PATCH] [Bleeding] Handle EntityHuman attack a bit more properly. --- src/main/java/net/minecraft/server/EntityHuman.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java index 69f6e62130..56c08fd148 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -778,7 +778,7 @@ public abstract class EntityHuman extends EntityLiving { } // CraftBukkit start - Don't call the event when the entity is human since it will be called with damageEntity - if (entity instanceof EntityLiving && !(entity instanceof EntityHuman)) { + if ((entity instanceof EntityLiving || entity instanceof EntityComplexPart) && !(entity instanceof EntityHuman)) { org.bukkit.entity.Entity damager = this.getBukkitEntity(); org.bukkit.entity.Entity damagee = (entity == null) ? null : entity.getBukkitEntity();