From 7d652d8cb6a3135efa95a46d4d206d2c0eac615c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 6 Oct 2019 12:46:35 -0500
Subject: [PATCH] Add option to set armorstand step height

---
 src/main/java/net/minecraft/server/EntityArmorStand.java | 2 +-
 src/main/java/net/pl3x/purpur/PurpurWorldConfig.java     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index dfe8c57cef..0f6870a45c 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -62,7 +62,6 @@ public class EntityArmorStand extends EntityLiving {
         this.leftLegPose = EntityArmorStand.bv;
         this.rightLegPose = EntityArmorStand.bw;
         if (world != null) this.canTick = world.paperConfig.armorStandTick; // Paper - armour stand ticking
-        this.H = 0.0F;
     }
 
     public EntityArmorStand(World world, double d0, double d1, double d2) {
@@ -615,6 +614,7 @@ public class EntityArmorStand extends EntityLiving {
 
     @Override
     public void tick() {
+        setStepHeight(world.purpurConfig.armorstandStepHeight); // Purpur
         // Paper start
         if (!this.canTick) {
             if (this.noTickPoseDirty) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2a5f7f96f5..4ca1f55baf 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -143,6 +143,7 @@ public class PurpurWorldConfig {
         turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
     }
 
+    public float armorstandStepHeight = 0.0F;
     public boolean boatEjectPlayersOnLand = false;
     public boolean controllableMinecarts = false;
     public boolean controllableMinecartsPlaceAnywhere = false;
@@ -155,6 +156,7 @@ public class PurpurWorldConfig {
     public boolean milkCuresBadOmen = true;
     public boolean useBetterMending = false;
     private void gameplayMechanicsSettings() {
+        armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight);
         boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
         controllableMinecarts = getBoolean("gameplay-mechanics.controllable-minecarts.enabled", controllableMinecarts);
         controllableMinecartsPlaceAnywhere = getBoolean("gameplay-mechanics.controllable-minecarts.place-anywhere", controllableMinecartsPlaceAnywhere);
-- 
2.24.0