47 lines
1.9 KiB
Diff
47 lines
1.9 KiB
Diff
From 0b995071bedb2a68563ceba6087ca30fd007ff92 Mon Sep 17 00:00:00 2001
|
|
From: mrapple <tony@oc.tc>
|
|
Date: Sun, 25 Nov 2012 13:43:39 -0600
|
|
Subject: [PATCH] Add methods for working with arrows stuck in living entities
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
|
index 1d5ea58..34abdd4 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
|
@@ -1270,10 +1270,12 @@ public abstract class EntityLiving extends Entity {
|
|
return (float) this.getAttributeInstance(GenericAttributes.maxHealth).getValue();
|
|
}
|
|
|
|
+ public final int getStuckArrows() { return this.bX(); } // Paper - deobfuscation helper
|
|
public final int bX() {
|
|
return ((Integer) this.datawatcher.get(EntityLiving.h)).intValue();
|
|
}
|
|
|
|
+ public final void setStuckArrows(int arrows) { this.k(arrows); } // Paper - deobfuscation helper
|
|
public final void k(int i) {
|
|
this.datawatcher.set(EntityLiving.h, Integer.valueOf(i));
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
index 6f25d18..693d5cb 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
@@ -531,4 +531,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
|
public AttributeInstance getAttribute(Attribute attribute) {
|
|
return getHandle().craftAttributes.getAttribute(attribute);
|
|
}
|
|
+
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public int getArrowsStuck() {
|
|
+ return this.getHandle().getStuckArrows();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setArrowsStuck(int arrows) {
|
|
+ this.getHandle().setStuckArrows(arrows);
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
--
|
|
2.7.3
|
|
|