diff options
| author | Feildmaster <admin@feildmaster.com> | 2012-02-08 23:23:47 -0600 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2012-02-09 20:17:03 -0500 |
| commit | fa6fd24f2a83c32c160dd8e88015b00d36a98547 (patch) | |
| tree | 285fb2ed4bacf0e88d80d8020e4b3f401035e3b3 /src/main | |
| parent | 8ecfca47def026cde9a80cf8a68af2476d0b65aa (diff) | |
| download | craftbukkit-fa6fd24f2a83c32c160dd8e88015b00d36a98547.tar craftbukkit-fa6fd24f2a83c32c160dd8e88015b00d36a98547.tar.gz craftbukkit-fa6fd24f2a83c32c160dd8e88015b00d36a98547.tar.lz craftbukkit-fa6fd24f2a83c32c160dd8e88015b00d36a98547.tar.xz craftbukkit-fa6fd24f2a83c32c160dd8e88015b00d36a98547.zip | |
[Bleeding] Handle EntityHuman attack a bit more properly.
Diffstat (limited to 'src/main')
| -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 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(); |