From 7964365c84f23425202ac1d30b08b0d973701531 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 12 Jun 2016 16:32:51 +1000
Subject: [PATCH] SPIGOT-2398: Armor stands still need to be treated special
 for gravity

---
 .../org/bukkit/craftbukkit/entity/CraftArmorStand.java     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
index 8a6df02612..2b66a08ade 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
@@ -149,6 +149,13 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
         getHandle().setBasePlate(!basePlate);
     }
 
+    @Override
+    public void setGravity(boolean gravity) {
+        super.setGravity(gravity);
+        // Armor stands are special
+        getHandle().noclip = !gravity;
+    }
+
     @Override
     public boolean isVisible() {
         return !getHandle().isInvisible();