summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/net/minecraft/server/EntityHuman.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 69f6e621..56c08fd1 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();