From 56741552e58c6a0c2b4482a73e913218d19e2488 Mon Sep 17 00:00:00 2001 From: EvilSeph Date: Thu, 9 Feb 2012 23:12:14 -0500 Subject: Made damaging EntityEnderCrystals fire EntityDamageByEntity. Fixes BUKKIT-724 --- src/main/java/net/minecraft/server/EntityHuman.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/net/minecraft') diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java index 56c08fd1..00e32df1 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 EntityComplexPart) && !(entity instanceof EntityHuman)) { + if ((entity instanceof EntityLiving || entity instanceof EntityComplexPart || entity instanceof EntityEnderCrystal) && !(entity instanceof EntityHuman)) { org.bukkit.entity.Entity damager = this.getBukkitEntity(); org.bukkit.entity.Entity damagee = (entity == null) ? null : entity.getBukkitEntity(); -- cgit v1.2.3