From d438d0f5bb2cdeb4dc85e42a2fe00e5898235f86 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Sat, 1 Apr 2023 23:35:41 +0100
Subject: [PATCH] Fixed armour crash

---
 .../client/model/AbstractPonyModel.java           |  9 ---------
 .../client/model/entity/race/EarthPonyModel.java  | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java
index 37bc43ee..72f7809f 100644
--- a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java
+++ b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java
@@ -38,9 +38,6 @@ public abstract class AbstractPonyModel<T extends LivingEntity> extends ClientPo
     public static final Pivot BACK_LEGS_SLEEPING = new Pivot(0, 2, -6);
 
     protected final ModelPart neck;
-    private final ModelPart mane;
-    private final ModelPart nose;
-    private final ModelPart tailStub;
 
     public final RenderList helmetRenderList;
     protected final RenderList neckRenderList;
@@ -59,9 +56,6 @@ public abstract class AbstractPonyModel<T extends LivingEntity> extends ClientPo
         super(tree);
 
         neck = tree.getChild("neck");
-        mane = neck.getChild("mane");
-        nose = head.getChild("nose");
-        tailStub = body.getChild("tail_stub");
         mainRenderList = RenderList.of()
             .add(withStage(BodyPart.BODY, bodyRenderList = RenderList.of(body).add(body::rotate)))
             .add(withStage(BodyPart.NECK, neckRenderList = RenderList.of(neck)))
@@ -563,9 +557,6 @@ public abstract class AbstractPonyModel<T extends LivingEntity> extends ClientPo
         super.setVisible(visible);
         neck.visible = visible;
         hat.visible &= !attributes.isHorsey;
-        mane.visible = attributes.isHorsey;
-        nose.visible = attributes.isHorsey;
-        tailStub.visible = !attributes.isHorsey;
         parts.forEach(part -> part.setVisible(visible, attributes));
     }
 
diff --git a/src/main/java/com/minelittlepony/client/model/entity/race/EarthPonyModel.java b/src/main/java/com/minelittlepony/client/model/entity/race/EarthPonyModel.java
index 150baff6..5e2aa335 100644
--- a/src/main/java/com/minelittlepony/client/model/entity/race/EarthPonyModel.java
+++ b/src/main/java/com/minelittlepony/client/model/entity/race/EarthPonyModel.java
@@ -16,8 +16,15 @@ public class EarthPonyModel<T extends LivingEntity> extends AbstractPonyModel<T>
     protected PonySnout snout;
     protected PonyEars ears;
 
+    private final ModelPart mane;
+    private final ModelPart nose;
+    private final ModelPart tailStub;
+
     public EarthPonyModel(ModelPart tree, boolean smallArms) {
         super(tree);
+        mane = neck.getChild("mane");
+        nose = head.getChild("nose");
+        tailStub = body.getChild("tail_stub");
         this.smallArms = smallArms;
     }
 
@@ -45,4 +52,12 @@ public class EarthPonyModel<T extends LivingEntity> extends AbstractPonyModel<T>
         }
         return super.getLegOutset();
     }
+
+    @Override
+    public void setVisible(boolean visible) {
+        super.setVisible(visible);
+        mane.visible = attributes.isHorsey;
+        nose.visible = attributes.isHorsey;
+        tailStub.visible = !attributes.isHorsey;
+    }
 }