From f7ab30557e92d45562eff901a4854407b7b94bba Mon Sep 17 00:00:00 2001 From: konsolas Date: Wed, 19 Feb 2020 23:04:55 +0000 Subject: [PATCH] #633: Add LivingEntity#attack, LivingEntity#swingMainHand, LivingEntity#swingOffHand --- .../craftbukkit/entity/CraftLivingEntity.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java index 959e7e6d9d..f8ac807d17 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -32,6 +32,7 @@ import net.minecraft.server.EntityTippedArrow; import net.minecraft.server.EntityTypes; import net.minecraft.server.EntityWither; import net.minecraft.server.EntityWitherSkull; +import net.minecraft.server.EnumHand; import net.minecraft.server.GenericAttributes; import net.minecraft.server.MobEffect; import net.minecraft.server.MobEffectList; @@ -583,6 +584,23 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { return (this.getHandle() instanceof EntityInsentient) ? !((EntityInsentient) this.getHandle()).isNoAI(): false; } + @Override + public void attack(Entity target) { + Preconditions.checkArgument(target != null, "target == null"); + + getHandle().B(((CraftEntity) target).getHandle()); // PAIL rename attack + } + + @Override + public void swingMainHand() { + getHandle().a(EnumHand.MAIN_HAND); // PAIL rename swingHand + } + + @Override + public void swingOffHand() { + getHandle().a(EnumHand.OFF_HAND); // PAIL rename swingHand + } + @Override public void setCollidable(boolean collidable) { getHandle().collides = collidable;