SPIGOT-973: Add marker API to ArmorStand

2 files changed, 30 insertions, 0 deletions

diff --git a/nms-patches/EntityArmorStand.patch b/nms-patches/EntityArmorStand.patch
index 338421d8..d7b6f74c 100644
--- a/nms-patches/EntityArmorStand.patch
+++ b/nms-patches/EntityArmorStand.patch
@@ -51,3 +51,21 @@
          if (this.world.isClientSide) {
              return false;
          } else if (DamageSource.OUT_OF_WORLD.equals(damagesource)) {
+@@ -616,7 +646,8 @@
+         return (this.datawatcher.getByte(10) & 8) != 0;
+     }
+ 
+-    private void n(boolean flag) {
++    // PAIL
++    public void n(boolean flag) { // CraftBukkit - public
+         byte b0 = this.datawatcher.getByte(10);
+ 
+         if (flag) {
+@@ -628,6 +659,7 @@
+         this.datawatcher.watch(10, Byte.valueOf(b0));
+     }
+ 
++    // PAIL
+     public boolean s() {
+         return (this.datawatcher.getByte(10) & 16) != 0;
+     }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
index 741b7654..09443fe1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
@@ -204,4 +204,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
             (float) Math.toDegrees(old.getZ())
         );
     }
+
+    @Override
+    public boolean isMarker() {
+        // PAIL
+        return getHandle().s();
+    }
+
+    @Override
+    public void setMarker(boolean marker) {
+        // PAIL
+        getHandle().n(marker);
+    }
 }