From 0d18697a67a544092b91b5673774d9371e062311 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Fri, 27 Mar 2020 21:09:33 +0200
Subject: [PATCH] Fixed piglin helmets not aligning with their heads

---
 .../minelittlepony/client/model/armour/PonyArmourModel.java | 6 ++++--
 .../client/render/entity/feature/ArmourFeature.java         | 2 +-
 src/main/java/com/minelittlepony/model/armour/IArmour.java  | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/minelittlepony/client/model/armour/PonyArmourModel.java b/src/main/java/com/minelittlepony/client/model/armour/PonyArmourModel.java
index 846cb542..b775fb67 100644
--- a/src/main/java/com/minelittlepony/client/model/armour/PonyArmourModel.java
+++ b/src/main/java/com/minelittlepony/client/model/armour/PonyArmourModel.java
@@ -65,11 +65,13 @@ public class PonyArmourModel<T extends LivingEntity> extends AbstractPonyModel<T
     }
 
     @Override
-    public void synchroniseLegs(IModel model) {
-
+    public void synchroniseAngles(IModel model) {
         if (model instanceof BipedEntityModel) {
             @SuppressWarnings("unchecked")
             BipedEntityModel<T> mainModel = (BipedEntityModel<T>)model;
+            head.copyPositionAndRotation(mainModel.head);
+            helmet.copyPositionAndRotation(mainModel.helmet);
+
             torso.copyPositionAndRotation(mainModel.torso);
             rightArm.copyPositionAndRotation(mainModel.rightArm);
             leftArm.copyPositionAndRotation(mainModel.leftArm);
diff --git a/src/main/java/com/minelittlepony/client/render/entity/feature/ArmourFeature.java b/src/main/java/com/minelittlepony/client/render/entity/feature/ArmourFeature.java
index 8ffed01d..e866bcbb 100644
--- a/src/main/java/com/minelittlepony/client/render/entity/feature/ArmourFeature.java
+++ b/src/main/java/com/minelittlepony/client/render/entity/feature/ArmourFeature.java
@@ -56,7 +56,7 @@ public class ArmourFeature<T extends LivingEntity, M extends EntityModel<T> & IP
             if (armour.prepareToRender(armorSlot, layer)) {
                 pony.getBody().copyAttributes(armour);
                 armour.setAngles(entity, limbAngle, limbDistance, age, headYaw, headPitch);
-                armour.synchroniseLegs(pony.getBody());
+                armour.synchroniseAngles(pony.getBody());
 
                 IArmourTextureResolver<T> resolver = armour instanceof IArmourTextureResolver ? (IArmourTextureResolver<T>)armour : (IArmourTextureResolver<T>)DEFAULT;
 
diff --git a/src/main/java/com/minelittlepony/model/armour/IArmour.java b/src/main/java/com/minelittlepony/model/armour/IArmour.java
index cfb189b3..37073ee0 100644
--- a/src/main/java/com/minelittlepony/model/armour/IArmour.java
+++ b/src/main/java/com/minelittlepony/model/armour/IArmour.java
@@ -6,11 +6,11 @@ import com.minelittlepony.model.IModel;
 
 public interface IArmour {
     /**
-     * Called to synchronise this model's legs with that of another.
+     * Called to synchronise this armour's angles with that of another.
      *
      * @param model The other model to mimic
      */
-    void synchroniseLegs(IModel model);
+    void synchroniseAngles(IModel model);
 
     /**
      * Resets the state of this model to all invisible.