From 376edf4fe54638e02b14a7f777ede0ef85a3ee90 Mon Sep 17 00:00:00 2001 From: Doc Date: Tue, 2 Nov 2021 18:33:35 +1100 Subject: [PATCH] SPIGOT-6779: Fix LivingEntity#attack for Player entities --- .../org/bukkit/craftbukkit/entity/CraftLivingEntity.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java index f5683567f..fb0b01933 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -651,7 +651,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { Preconditions.checkArgument(target != null, "target == null"); Preconditions.checkState(!getHandle().generation, "Cannot attack during world generation"); - getHandle().attackEntity(((CraftEntity) target).getHandle()); + if (getHandle() instanceof EntityHuman) { + ((EntityHuman) getHandle()).attack(((CraftEntity) target).getHandle()); + } else { + getHandle().attackEntity(((CraftEntity) target).getHandle()); + } } @Override