From 7a6a6716de90e67c21160fb8c711b6f201003ec8 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Fri, 24 Aug 2018 13:54:24 +0200
Subject: [PATCH] Fixed ear behaviour on armour

---
 .../com/minelittlepony/model/AbstractPonyModel.java | 13 ++++++++-----
 .../minelittlepony/model/armour/ModelPonyArmor.java |  9 ++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java
index 8a29486a..59c1bd5b 100644
--- a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java
+++ b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java
@@ -528,14 +528,11 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel, P
     }
 
     protected void initHead(float yOffset, float stretch) {
-
-
         bipedHead = new PonyRenderer(this, 0, 0)
                                  .offset(HEAD_CENTRE_X, HEAD_CENTRE_Y, HEAD_CENTRE_Z)
                                  .around(HEAD_RP_X, HEAD_RP_Y + yOffset, HEAD_RP_Z - 2)
-                                 .box(-4, -4, -4, 8, 8, 8, stretch)
-                     .tex(12, 16).box(-4, -6, 1, 2, 2, 2, stretch)
-                          .flip().box( 2, -6, 1, 2, 2, 2, stretch);
+                                 .box(-4, -4, -4, 8, 8, 8, stretch);
+        initEars(((PonyRenderer)bipedHead), yOffset, stretch);
 
         bipedHeadwear = new PonyRenderer(this, 32, 0)
                                      .offset(HEAD_CENTRE_X, HEAD_CENTRE_Y, HEAD_CENTRE_Z)
@@ -546,6 +543,11 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel, P
         snout.init(yOffset, stretch);
     }
 
+    protected void initEars(PonyRenderer head, float yOffset, float stretch) {
+        head.tex(12, 16).box(-4, -6, 1, 2, 2, 2, stretch)  // right ear
+                 .flip().box( 2, -6, 1, 2, 2, 2, stretch); // left ear
+    }
+
     protected void initTail(float yOffset, float stretch) {
         tail = new PonyTail(this);
         tail.init(yOffset, stretch);
@@ -786,6 +788,7 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel, P
         transform(BodyPart.LEGS);
         renderLegs(scale);
         popMatrix();
+
     }
 
     /**
diff --git a/src/main/java/com/minelittlepony/model/armour/ModelPonyArmor.java b/src/main/java/com/minelittlepony/model/armour/ModelPonyArmor.java
index a56f1ff4..48c3a581 100644
--- a/src/main/java/com/minelittlepony/model/armour/ModelPonyArmor.java
+++ b/src/main/java/com/minelittlepony/model/armour/ModelPonyArmor.java
@@ -41,11 +41,10 @@ public class ModelPonyArmor extends AbstractPonyModel implements IModelArmor {
     }
 
     @Override
-    protected void initHead(float yOffset, float stretch) {
-        super.initHead(yOffset, stretch * 1.1F);
-        ((PonyRenderer)bipedHead).child()
-                .tex(0, 4).box(2, -6, 1, 2, 2, 2, stretch * 0.5F)
-                          .box(-4, -6, 1, 2, 2, 2, stretch * 0.5F);
+    protected void initEars(PonyRenderer head, float yOffset, float stretch) {
+        stretch /= 2;
+        head.tex(0, 0).box(-4, -6, 1, 2, 2, 2, stretch)  // right ear
+            .tex(0, 4).box( 2, -6, 1, 2, 2, 2, stretch); // left ear
     }
 
     @Override