From 2752bdcc4ca3b1ff6112cb161ba86fdcc274ecb7 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Fri, 17 Aug 2018 12:32:32 +0200
Subject: [PATCH] Fix arm positioning (final)

---
 .../render/player/RenderPonyPlayer.java       | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/minelittlepony/render/player/RenderPonyPlayer.java b/src/main/java/com/minelittlepony/render/player/RenderPonyPlayer.java
index 93c4ea9c..fc533a93 100644
--- a/src/main/java/com/minelittlepony/render/player/RenderPonyPlayer.java
+++ b/src/main/java/com/minelittlepony/render/player/RenderPonyPlayer.java
@@ -29,6 +29,7 @@ import net.minecraft.client.renderer.entity.layers.LayerArrow;
 import net.minecraft.client.resources.DefaultPlayerSkin;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumHandSide;
 import net.minecraft.util.ResourceLocation;
 
 import java.util.Map;
@@ -81,11 +82,9 @@ public class RenderPonyPlayer extends RenderPlayer implements IRenderPony<Abstra
     }.register(ISkull.PLAYER);
 
     protected final RenderPony<AbstractClientPlayer> renderPony = new RenderPony<>(this);
-    private final RenderPlayer renderPlayer;
 
     public RenderPonyPlayer(RenderManager manager, boolean useSmallArms, ModelWrapper model) {
         super(manager, useSmallArms);
-        renderPlayer = new RenderPlayer(manager, useSmallArms);
 
         mainModel = renderPony.setPonyModel(model);
 
@@ -142,14 +141,29 @@ public class RenderPonyPlayer extends RenderPlayer implements IRenderPony<Abstra
 
     @Override
     public final void renderRightArm(AbstractClientPlayer player) {
-        renderPlayer.renderRightArm(player);
+        renderArm(player, EnumHandSide.RIGHT);
     }
 
     @Override
     public final void renderLeftArm(AbstractClientPlayer player) {
-        renderPlayer.renderLeftArm(player);
+        renderArm(player, EnumHandSide.LEFT);
     }
 
+    protected void renderArm(AbstractClientPlayer player, EnumHandSide side) {
+        renderPony.updateModel(player);
+        bindEntityTexture(player);
+        GlStateManager.pushMatrix();
+        GlStateManager.translate(side == EnumHandSide.LEFT ? 0.2 : -0.2, -0.65, 0);
+
+        if (side == EnumHandSide.LEFT) {
+            super.renderLeftArm(player);
+        } else {
+            super.renderRightArm(player);
+        }
+
+        GlStateManager.popMatrix();
+     }
+
     @Override
     protected void applyRotations(AbstractClientPlayer player, float yaw, float pitch, float ticks) {
         super.applyRotations(player, yaw, pitch, ticks);