mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 04:02:50 +01:00
52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
From 730c4aa970ce747e826e3bced65b27bc36bf09a6 Mon Sep 17 00:00:00 2001
|
|
From: Anonymoose <MrAnonHimself@anon.life>
|
|
Date: Sun, 3 May 2015 17:44:20 -0500
|
|
Subject: [PATCH] Add ArmorStand Marker NBT API
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
|
index d4c82c7..6c1447e 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
|
|
@@ -649,7 +649,7 @@ public class EntityArmorStand extends EntityLiving {
|
|
return (this.datawatcher.getByte(10) & 8) != 0;
|
|
}
|
|
|
|
- private void n(boolean flag) {
|
|
+ public void n(boolean flag) { // PaperSpigot - private -> public, setSmallBoundingBox (Marker) NBT
|
|
byte b0 = this.datawatcher.getByte(10);
|
|
|
|
if (flag) {
|
|
@@ -661,7 +661,7 @@ public class EntityArmorStand extends EntityLiving {
|
|
this.datawatcher.watch(10, Byte.valueOf(b0));
|
|
}
|
|
|
|
- public boolean s() {
|
|
+ public boolean s() { // PaperSpigot - isSmallBoundingBox
|
|
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 741b765..591c5a1 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())
|
|
);
|
|
}
|
|
+
|
|
+ // PaperSpigot start - Implement bounding box (Marker) API
|
|
+ @Override
|
|
+ public boolean isSmallBoundingBox() {
|
|
+ return getHandle().s();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setSmallBoundingBox(boolean small) {
|
|
+ getHandle().n(small);
|
|
+ }
|
|
+ // PaperSpigot end
|
|
}
|
|
--
|
|
1.9.5.msysgit.1
|
|
|