summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2015-02-01 18:12:55 +1100
committermd_5 <git@md-5.net>2015-02-01 18:12:55 +1100
commitbbf72f30606084e61b28a7521f46c9c34caeaeda (patch)
tree1d4f949d86b9727c29fee56390583b9b53973a34
parenta956d73f1024a83a219e9235906db57a9da6963a (diff)
downloadcraftbukkit-bbf72f30606084e61b28a7521f46c9c34caeaeda.tar
craftbukkit-bbf72f30606084e61b28a7521f46c9c34caeaeda.tar.gz
craftbukkit-bbf72f30606084e61b28a7521f46c9c34caeaeda.tar.lz
craftbukkit-bbf72f30606084e61b28a7521f46c9c34caeaeda.tar.xz
craftbukkit-bbf72f30606084e61b28a7521f46c9c34caeaeda.zip
SPIGOT-508: Set noclip flag when changing armor stand gravity
-rw-r--r--nms-patches/EntityArmorStand.patch13
1 files changed, 11 insertions, 2 deletions
diff --git a/nms-patches/EntityArmorStand.patch b/nms-patches/EntityArmorStand.patch
index 9dc6ba25..07de6e30 100644
--- a/nms-patches/EntityArmorStand.patch
+++ b/nms-patches/EntityArmorStand.patch
@@ -1,5 +1,5 @@
---- ../work/decompile-8eb82bde//net/minecraft/server/EntityArmorStand.java 2014-11-29 16:03:15.597435308 +0000
-+++ src/main/java/net/minecraft/server/EntityArmorStand.java 2014-11-29 16:02:17.625436595 +0000
+--- ../work/decompile-8eb82bde/net/minecraft/server/EntityArmorStand.java 2015-02-01 18:12:22.718390345 +1100
++++ src/main/java/net/minecraft/server/EntityArmorStand.java 2015-02-01 18:12:22.718390345 +1100
@@ -343,6 +343,11 @@
}
@@ -12,3 +12,12 @@
if (!this.world.isStatic && !this.h) {
if (DamageSource.OUT_OF_WORLD.equals(damagesource)) {
this.die();
+@@ -542,6 +547,8 @@
+ }
+
+ this.datawatcher.watch(10, Byte.valueOf(b0));
++
++ this.T = flag; // CraftBukkit. // PAIL: Rename (noclip)
+ }
+
+ public boolean hasGravity() {