Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-24 18:07:39 +01:00
Code Issues Projects Releases Wiki Activity

[Bleeding] Handle EntityHuman attack a bit more properly.

Browse Source
This commit is contained in:
Feildmaster 2012-02-08 23:23:47 -06:00 committed by EvilSeph
parent 8ecfca47de
commit fa6fd24f2a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minecraft/server/EntityHuman.java
View File

@ -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();