SPIGOT-2824: Llama Strength API

2 files changed, 33 insertions, 0 deletions

diff --git a/nms-patches/EntityLlama.patch b/nms-patches/EntityLlama.patch
new file mode 100644
index 00000000..c3214d7e
--- /dev/null
+++ b/nms-patches/EntityLlama.patch
@@ -0,0 +1,20 @@
+--- a/net/minecraft/server/EntityLlama.java
++++ b/net/minecraft/server/EntityLlama.java
+@@ -20,7 +20,7 @@
+         this.setSize(0.9F, 1.87F);
+     }
+ 
+-    private void p(int i) {
++    public void p(int i) { // PAIL: private-> public, rename
+         this.datawatcher.set(EntityLlama.bG, Integer.valueOf(Math.max(1, Math.min(5, i))));
+     }
+ 
+@@ -30,7 +30,7 @@
+         this.p(1 + this.random.nextInt(i));
+     }
+ 
+-    public int dL() {
++    public int dL() { // PAIL: rename
+         return ((Integer) this.datawatcher.get(EntityLlama.bG)).intValue();
+     }
+ 
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
index 9dde90fa..45e17db5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
@@ -38,6 +38,19 @@ public class CraftLlama extends CraftChestedHorse implements Llama {
     }
 
     @Override
+    public int getStrength() {
+       return getHandle().dL();
+    }
+
+    @Override
+    public void setStrength(int strength) {
+        Preconditions.checkArgument(1 <= strength && strength <= 5, "strength must be [1,5]");
+        if (strength == getStrength()) return;
+        getHandle().p(strength);
+        getHandle().dx();
+    }
+
+    @Override
     public Horse.Variant getVariant() {
         return Horse.Variant.LLAMA;
     }