mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-24 17:03:51 -07:00
[Bleeding] Handle EntityHuman attack a bit more properly.
This commit is contained in:
@@ -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
|
// 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 damager = this.getBukkitEntity();
|
||||||
org.bukkit.entity.Entity damagee = (entity == null) ? null : entity.getBukkitEntity();
|
org.bukkit.entity.Entity damagee = (entity == null) ? null : entity.getBukkitEntity();
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user