From b8a3740ad20648eadbe7ada42d91f98e842dd0df Mon Sep 17 00:00:00 2001
From: "Luis C.M" <42545778+c0508383@users.noreply.github.com>
Date: Mon, 23 Jan 2023 22:58:55 -0600
Subject: [PATCH] Fixed player animations not updating after re-logging.

---
 .../npcs/client/ClientEventHandler.java       | 54 -------------------
 .../npcs/client/PacketHandlerClient.java      | 10 +---
 2 files changed, 2 insertions(+), 62 deletions(-)

diff --git a/src/main/java/noppes/npcs/client/ClientEventHandler.java b/src/main/java/noppes/npcs/client/ClientEventHandler.java
index 1d4a2aba2..b016f74d3 100644
--- a/src/main/java/noppes/npcs/client/ClientEventHandler.java
+++ b/src/main/java/noppes/npcs/client/ClientEventHandler.java
@@ -5,7 +5,6 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.model.ModelBase;
-import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.entity.RendererLivingEntity;
@@ -24,7 +23,6 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 
 public class ClientEventHandler {
     public static final RenderCNPCPlayer renderCNPCPlayer = new RenderCNPCPlayer();
@@ -119,58 +117,6 @@ public class ClientEventHandler {
         ClientEventHandler.renderingNpc = null;
     }
 
-    public EnumAnimationPart getPlayerPartType(ModelRenderer renderer) {
-        if (renderer.baseModel instanceof ModelBiped) {
-            if (renderer == ((ModelBiped) renderer.baseModel).bipedHead
-                    || renderer == ((ModelBiped) renderer.baseModel).bipedHeadwear) {
-                return EnumAnimationPart.HEAD;
-            }
-            if (renderer == ((ModelBiped) renderer.baseModel).bipedBody) {
-                return EnumAnimationPart.BODY;
-            }
-            if (renderer == ((ModelBiped) renderer.baseModel).bipedRightArm) {
-                return EnumAnimationPart.RIGHT_ARM;
-            }
-            if (renderer == ((ModelBiped) renderer.baseModel).bipedLeftArm) {
-                return EnumAnimationPart.LEFT_ARM;
-            }
-            if (renderer == ((ModelBiped) renderer.baseModel).bipedRightLeg) {
-                return EnumAnimationPart.RIGHT_LEG;
-            }
-            if (renderer == ((ModelBiped) renderer.baseModel).bipedLeftLeg) {
-                return EnumAnimationPart.LEFT_LEG;
-            }
-        }
-
-        try {
-            Class<?> ModelBipedBody = Class.forName("JinRyuu.JRMCore.entity.ModelBipedBody");
-            Object model = renderer.baseModel;
-            Field[] declared;
-            if (ClientEventHandler.declaredFieldCache.containsKey(ModelBipedBody)) {
-                declared = ClientEventHandler.declaredFieldCache.get(ModelBipedBody);
-            } else {
-                declared = ModelBipedBody.getDeclaredFields();
-                ClientEventHandler.declaredFieldCache.put(ModelBipedBody,declared);
-            }
-            Set<Map.Entry<EnumAnimationPart, String[]>> entrySet = ClientEventHandler.partNames.entrySet();
-            for (Field f : declared) {
-                f.setAccessible(true);
-                for (Map.Entry<EnumAnimationPart, String[]> entry : entrySet) {
-                    String[] names = entry.getValue();
-                    for (String partName : names) {
-                        try {
-                            if (partName.equals(f.getName()) && renderer == f.get(model)) {
-                                return entry.getKey();
-                            }
-                        } catch (IllegalAccessException ignored) {}
-                    }
-                }
-            }
-        } catch (ClassNotFoundException ignored) {}
-
-        return null;
-    }
-
     @SubscribeEvent
     public void onUpdateEntity(LivingEvent.LivingUpdateEvent event) {
         if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) {
diff --git a/src/main/java/noppes/npcs/client/PacketHandlerClient.java b/src/main/java/noppes/npcs/client/PacketHandlerClient.java
index 746d3864d..32e3823a1 100644
--- a/src/main/java/noppes/npcs/client/PacketHandlerClient.java
+++ b/src/main/java/noppes/npcs/client/PacketHandlerClient.java
@@ -303,14 +303,8 @@ public class PacketHandlerClient extends PacketHandlerServer{
 			} else {
 				EntityPlayer sendingPlayer = Minecraft.getMinecraft().theWorld.getPlayerEntityByName(Server.readString(buffer));
 				if (sendingPlayer != null) {
-					AnimationData data;
-					if (!Client.playerAnimations.containsKey(sendingPlayer.getUniqueID())) {
-						data = new AnimationData(sendingPlayer);
-						data.readFromNBT(compound);
-					} else {
-						data = Client.playerAnimations.get(sendingPlayer.getUniqueID());
-						data.readFromNBT(compound);
-					}
+					AnimationData data = new AnimationData(sendingPlayer);
+					data.readFromNBT(compound);
 					data.animation = new Animation();
 					data.animation.readFromNBT(compound.getCompoundTag("Animation"));
 					Client.playerAnimations.put(sendingPlayer.getUniqueID(), data);