From 240345f29ac2ead8b008caf04dd21b81719d12b5 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Sat, 18 Aug 2018 15:13:08 +0200
Subject: [PATCH] Fixed armour leg placement when riding

---
 .../java/com/minelittlepony/model/AbstractPonyModel.java    | 1 +
 .../com/minelittlepony/model/armour/ModelPonyArmor.java     | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java
index ead53ac1..112cb843 100644
--- a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java
+++ b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java
@@ -864,6 +864,7 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel, P
             isElytraFlying = pony.isElytraFlying;
             isSwimming = pony.isSwimming;
             isSleeping = pony.isSleeping;
+            headGear = pony.headGear;
             metadata = pony.metadata;
             motionPitch = pony.motionPitch;
             rainboom = pony.rainboom;
diff --git a/src/main/java/com/minelittlepony/model/armour/ModelPonyArmor.java b/src/main/java/com/minelittlepony/model/armour/ModelPonyArmor.java
index 9c3cf002..856be4e0 100644
--- a/src/main/java/com/minelittlepony/model/armour/ModelPonyArmor.java
+++ b/src/main/java/com/minelittlepony/model/armour/ModelPonyArmor.java
@@ -32,11 +32,8 @@ public class ModelPonyArmor extends AbstractPonyModel implements IModelArmor {
     }
 
     @Override
-    protected void renderLegs(float scale) {
-        super.renderLegs(scale);
-    }
-
     public <T extends ModelBiped & IModel> void synchroniseLegs(T mainModel) {
+        copyModelAngles(mainModel.bipedBody, bipedBody);
         copyModelAngles(mainModel.bipedRightArm, bipedRightArm);
         copyModelAngles(mainModel.bipedLeftArm, bipedLeftArm);
         copyModelAngles(mainModel.bipedRightLeg, bipedRightLeg);
@@ -72,6 +69,7 @@ public class ModelPonyArmor extends AbstractPonyModel implements IModelArmor {
     @Override
     public void setInVisible() {
         setVisible(false);
+        bipedBody.showModel = true;
         chestPiece.showModel = false;
         bipedHead.showModel = false;
         neck.showModel = false;