48 Zeilen
1.8 KiB
Diff
48 Zeilen
1.8 KiB
Diff
From 64a5ce6845ec10f63c342d57c304a2c498025462 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 da52fe7..2363b1f 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
|
@@ -1272,10 +1272,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 aed3e4f..0502593 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
@@ -553,4 +553,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
|
public boolean isCollidable() {
|
|
return getHandle().collides;
|
|
}
|
|
+
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public int getArrowsStuck() {
|
|
+ return this.getHandle().getStuckArrows();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setArrowsStuck(int arrows) {
|
|
+ this.getHandle().setStuckArrows(arrows);
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
--
|
|
2.7.4
|
|
|