From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: mrapple Date: Sun, 25 Nov 2012 13:43:39 -0600 Subject: [PATCH] Add methods for working with arrows stuck in living entities Upstream added methods for this, original methods are now deprecated diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java index aaf8ad36078554aa2783874f395da0997f6af92c..2be4b3f8129e38f72c6c0013cc0de7060a78ae76 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -267,9 +267,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { } @Override - public void setArrowsInBody(int count) { + public void setArrowsInBody(final int count, final boolean fireEvent) { // Paper Preconditions.checkArgument(count >= 0, "New arrow amount must be >= 0"); + if (!fireEvent) { // Paper this.getHandle().getEntityData().set(net.minecraft.world.entity.LivingEntity.DATA_ARROW_COUNT_ID, count); + // Paper start + } else { + this.getHandle().setArrowCount(count); + } + // Paper end } @Override @@ -783,4 +789,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { this.getHandle().persistentInvisibility = invisible; this.getHandle().setSharedFlag(5, invisible); } + + // Paper start + @Override + public int getArrowsStuck() { + return this.getHandle().getArrowCount(); + } + + @Override + public void setArrowsStuck(final int arrows) { + this.getHandle().setArrowCount(arrows); + } + // Paper end }