From ef2052a23e0f3d6f935425224eeae5e4033ce4d4 Mon Sep 17 00:00:00 2001
From: Matthew Messinger <mattmess1221@gmail.com>
Date: Fri, 5 Jul 2019 00:49:16 -0400
Subject: [PATCH] Fix worn head placement Also shrink the headwear to be closer
 to vanilla. It helps to hide it while wearing the head.

---
 .../minelittlepony/client/model/AbstractPonyModel.java    | 2 +-
 .../client/render/layer/LayerPonyCustomHead.java          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java
index 3b477078..509b5a56 100644
--- a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java
+++ b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java
@@ -534,7 +534,7 @@ public abstract class AbstractPonyModel<T extends LivingEntity> extends ClientPo
         headwear = new PonyRenderer(this, 32, 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 + 0.7504F);
+                                     .box(-4, -4, -4, 8, 8, 8, stretch + 0.5F);
 
         snout = new PonySnout(this);
         snout.init(yOffset, stretch);
diff --git a/src/main/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java b/src/main/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java
index 699f7da3..1f3564e6 100644
--- a/src/main/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java
+++ b/src/main/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java
@@ -45,7 +45,7 @@ public class LayerPonyCustomHead<T extends LivingEntity, M extends EntityModel<T
             model.getHead().applyTransform(0.0625f);
 
             if (model instanceof AbstractPonyModel) {
-                translatef(0, 0.2F, 0);
+                translatef(0, 0.225F, 0);
             } else {
                 translatef(0, 0, 0.15F);
             }
@@ -80,7 +80,7 @@ public class LayerPonyCustomHead<T extends LivingEntity, M extends EntityModel<T
         if (isVillager) {
             translatef(0, 0.0625F, 0);
         }
-        translatef(0, 0, -0.05F);
+
         GameProfile profile = null;
 
         if (itemstack.hasTag()) {
@@ -98,12 +98,12 @@ public class LayerPonyCustomHead<T extends LivingEntity, M extends EntityModel<T
 
         SkullType type = ((AbstractSkullBlock) ((BlockItem) itemstack.getItem()).getBlock()).getSkullType();
 
-        PonySkullRenderer.resolve().render(-0.5F, 0, -0.45F, Direction.UP, 180, type, profile, -1, limbSwing);
+        PonySkullRenderer.resolve().render(-0.5F, 0, -0.5F, null, 180, type, profile, -1, limbSwing);
     }
 
     @Override
     public boolean hasHurtOverlay() {
-        return true;
+        return false;
     }
 
 }