2017-02-02 05:48:16 +01:00
|
|
|
From 73d194d5f867e136da9d1f67208185c63001a13d Mon Sep 17 00:00:00 2001
|
2016-03-09 05:21:08 +01:00
|
|
|
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
|
2017-01-29 00:36:03 +01:00
|
|
|
index a2d476818..193dadf43 100644
|
2016-03-09 05:21:08 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
2017-01-02 07:58:15 +01:00
|
|
|
@@ -1380,10 +1380,12 @@ public abstract class EntityLiving extends Entity {
|
2016-03-09 05:21:08 +01:00
|
|
|
return (float) this.getAttributeInstance(GenericAttributes.maxHealth).getValue();
|
|
|
|
}
|
|
|
|
|
2016-11-17 03:23:38 +01:00
|
|
|
+ public final int getStuckArrows() { return this.cc(); } // Paper - OBFHELPER
|
|
|
|
public final int cc() {
|
|
|
|
return ((Integer) this.datawatcher.get(EntityLiving.bq)).intValue();
|
2016-03-09 05:21:08 +01:00
|
|
|
}
|
|
|
|
|
2016-06-09 05:57:14 +02:00
|
|
|
+ public final void setStuckArrows(int arrows) { this.f(arrows); } // Paper - OBFHELPER
|
|
|
|
public final void f(int i) {
|
2016-11-17 03:23:38 +01:00
|
|
|
this.datawatcher.set(EntityLiving.bq, Integer.valueOf(i));
|
2016-03-09 05:21:08 +01:00
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
2017-02-02 05:48:16 +01:00
|
|
|
index 5520c707e..eeb4f5b32 100644
|
2016-03-09 05:21:08 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
2017-02-02 05:48:16 +01:00
|
|
|
@@ -566,4 +566,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
2016-03-28 03:48:50 +02:00
|
|
|
public boolean isCollidable() {
|
|
|
|
return getHandle().collides;
|
2016-03-09 05:21:08 +01:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ // Paper start
|
|
|
|
+ @Override
|
|
|
|
+ public int getArrowsStuck() {
|
|
|
|
+ return this.getHandle().getStuckArrows();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setArrowsStuck(int arrows) {
|
|
|
|
+ this.getHandle().setStuckArrows(arrows);
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
--
|
2017-01-02 07:58:15 +01:00
|
|
|
2.11.0
|
2016-03-09 05:21:08 +01:00
|
|
|
|