diff options
| author | EvilSeph <evilseph@gmail.com> | 2012-02-09 23:12:14 -0500 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2012-02-09 23:31:10 -0500 |
| commit | 56741552e58c6a0c2b4482a73e913218d19e2488 (patch) | |
| tree | 5f58e9c01abbe0b9087df8e593d7043dbfd7563e /src/main/java/net/minecraft/server/EntityHuman.java | |
| parent | 391ac23c9a6165b23ccc44abf29e6a8fb7b1b6e0 (diff) | |
| download | craftbukkit-56741552e58c6a0c2b4482a73e913218d19e2488.tar craftbukkit-56741552e58c6a0c2b4482a73e913218d19e2488.tar.gz craftbukkit-56741552e58c6a0c2b4482a73e913218d19e2488.tar.lz craftbukkit-56741552e58c6a0c2b4482a73e913218d19e2488.tar.xz craftbukkit-56741552e58c6a0c2b4482a73e913218d19e2488.zip | |
Made damaging EntityEnderCrystals fire EntityDamageByEntity. Fixes BUKKIT-724
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityHuman.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityHuman.java | 2 |
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 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(); |