From 46ea214b64493d7b77ec34a934e8d485b32057e1 Mon Sep 17 00:00:00 2001 From: luisc Date: Wed, 18 Jan 2023 09:26:50 -0600 Subject: [PATCH] Fixed animation times not resetting, causing some animations to get stuck if still enabled when in the middle of a frame that lasts a very long time. --- src/main/java/noppes/npcs/client/PacketHandlerClient.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/noppes/npcs/client/PacketHandlerClient.java b/src/main/java/noppes/npcs/client/PacketHandlerClient.java index bd73c46d8..e95870b50 100644 --- a/src/main/java/noppes/npcs/client/PacketHandlerClient.java +++ b/src/main/java/noppes/npcs/client/PacketHandlerClient.java @@ -297,9 +297,7 @@ public class PacketHandlerClient extends PacketHandlerServer{ if (entity instanceof EntityNPCInterface) { AnimationData data = ((EntityNPCInterface) entity).display.animationData; data.readFromNBT(compound); - if (data.animation == null) { - data.animation = new Animation(); - } + data.animation = new Animation(); data.animation.readFromNBT(compound.getCompoundTag("Animation")); } } else { @@ -313,9 +311,7 @@ public class PacketHandlerClient extends PacketHandlerServer{ data = Client.playerAnimations.get(player.getUniqueID()); data.readFromNBT(compound); } - if (data.animation == null) { - data.animation = new Animation(); - } + data.animation = new Animation(); data.animation.readFromNBT(compound.getCompoundTag("Animation")); Client.playerAnimations.put(player.getUniqueID(), data); }