From e65ba59b8e96fa23016caa812db38fde7e2b06ae Mon Sep 17 00:00:00 2001
From: "Luis C.M" <42545778+c0508383@users.noreply.github.com>
Date: Tue, 14 Feb 2023 01:26:40 -0600
Subject: [PATCH] Fix to setting animation names.

---
 src/main/java/noppes/npcs/PacketHandlerServer.java        | 3 ++-
 .../npcs/client/gui/global/GuiNPCManageAnimations.java    | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/noppes/npcs/PacketHandlerServer.java b/src/main/java/noppes/npcs/PacketHandlerServer.java
index 4f14c0b31..9f4a3723e 100644
--- a/src/main/java/noppes/npcs/PacketHandlerServer.java
+++ b/src/main/java/noppes/npcs/PacketHandlerServer.java
@@ -888,9 +888,10 @@ public class PacketHandlerServer{
 		}
 		else if (type == EnumPacketServer.AnimationSave) {
 			String prevName = Server.readString(buffer);
+			AnimationController.instance.animations.remove(prevName);
 			Animation animation = new Animation();
 			animation.readFromNBT(Server.readNBT(buffer));
-			if (prevName != null && !prevName.equals(animation.getName()) && AnimationController.instance.has(animation.getName())) {
+			if (AnimationController.instance.has(animation.getName())) {
 				animation.name = prevName;
 			}
 			animation.save();
diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java
index 9d93d2046..b5343f45b 100644
--- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java
@@ -450,7 +450,13 @@ public class GuiNPCManageAnimations extends GuiModelInterface implements IScroll
         FramePart part = this.editingPart();
 
         if (textfield.id == 30 && !text.isEmpty()) {
-            animation.name = text.replaceAll("[^a-zA-Z0-9_-]", "_");
+            String nameText = text.replaceAll("[^a-zA-Z0-9_-]", "_");
+            if (!scroll.getList().contains(nameText)) {
+                animation.name = nameText;
+                Client.sendData(EnumPacketServer.AnimationSave, prevSelected, animation.writeToNBT());
+            } else {
+                textfield.setText(animation.name);
+            }
         } else if (textfield.id == 32) {
             if (editingMode == 0) {
                 animation.speed = textfield.getFloat();