SPIGOT-657: Set armor stand noclip flag in correct place.

nms-patches/EntityArmorStand.patch

@@ -1,5 +1,5 @@
---- /home/matt/mc-dev-private//net/minecraft/server/EntityArmorStand.java	2015-02-26 22:40:22.475608141 +0000
+--- ../work/decompile-73f3c166/net/minecraft/server/EntityArmorStand.java	2015-03-08 19:09:59.090302843 +1100
-+++ src/main/java/net/minecraft/server/EntityArmorStand.java	2015-02-26 22:40:22.475608141 +0000
++++ src/main/java/net/minecraft/server/EntityArmorStand.java	2015-03-08 19:09:59.090302843 +1100
 @@ -2,6 +2,15 @@
  
  import java.util.List;
@@ -81,15 +81,7 @@
          byte b0 = this.datawatcher.getByte(10);
  
          if (flag) {
-@@ -562,13 +594,15 @@
+@@ -568,7 +600,7 @@
-         }
- 
-         this.datawatcher.watch(10, Byte.valueOf(b0));
-+
-+        this.noclip = flag; // CraftBukkit.
-     }
- 
-     public boolean isSmall() {
          return (this.datawatcher.getByte(10) & 1) != 0;
      }
  
@@ -98,7 +90,14 @@
          byte b0 = this.datawatcher.getByte(10);
  
          if (flag) {
-@@ -584,7 +618,7 @@
+@@ -578,13 +610,14 @@
+         }
+ 
+         this.datawatcher.watch(10, Byte.valueOf(b0));
++        this.noclip = flag; // CraftBukkit.
+     }
+ 
+     public boolean hasGravity() {
          return (this.datawatcher.getByte(10) & 2) != 0;
      }
  
@@ -107,7 +106,7 @@
          byte b0 = this.datawatcher.getByte(10);
  
          if (flag) {
-@@ -600,7 +634,7 @@
+@@ -600,7 +633,7 @@
          return (this.datawatcher.getByte(10) & 4) != 0;
      }