1 files changed, 7 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
index 8a6df026..2b66a08a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
@@ -150,6 +150,13 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
     }
 
     @Override
+    public void setGravity(boolean gravity) {
+        super.setGravity(gravity);
+        // Armor stands are special
+        getHandle().noclip = !gravity;
+    }
+
+    @Override
     public boolean isVisible() {
         return !getHandle().isInvisible();
     }