From 69154bec2486304a8e37bd30d43ccb1f0e93bd40 Mon Sep 17 00:00:00 2001 From: KAMKEEL Date: Wed, 22 Mar 2023 16:07:09 -0400 Subject: [PATCH] Send ServerTag Map through packet --- .../java/noppes/npcs/PacketHandlerServer.java | 23 ++----------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/src/main/java/noppes/npcs/PacketHandlerServer.java b/src/main/java/noppes/npcs/PacketHandlerServer.java index aae75cd7a..998b56d9c 100644 --- a/src/main/java/noppes/npcs/PacketHandlerServer.java +++ b/src/main/java/noppes/npcs/PacketHandlerServer.java @@ -1078,28 +1078,9 @@ public class PacketHandlerServer{ else if (type == EnumPacketServer.CloneTagList) { int tab = buffer.readInt(); List cloneNames = ServerCloneController.Instance.getClones(tab); - NBTTagList cloneTags = new NBTTagList(); - for (String name : cloneNames) { - NBTTagCompound compound = ServerCloneController.Instance.getCloneData(null, name, tab); - if (compound.hasKey("TagUUIDs")) { - NBTTagCompound tagCompound = new NBTTagCompound(); - tagCompound.setString("Name",name); - - NBTTagList uuidList = compound.getTagList("TagUUIDs",8); - NBTTagList tags = new NBTTagList(); - for (int i = 0; i < uuidList.tagCount(); i++) { - String uuidString = uuidList.getStringTagAt(i); - NBTTagCompound tagNBT = new NBTTagCompound(); - TagController.getInstance().getTagFromUUID(UUID.fromString(uuidString)).writeNBT(tagNBT); - tags.appendTag(tagNBT); - } - tagCompound.setTag("Tags",tags); - cloneTags.appendTag(tagCompound); - } - } - + TagMap tagMap = ServerTagMapController.Instance.getTagMap(tab); NBTTagCompound compound = new NBTTagCompound(); - compound.setTag("CloneTags", cloneTags); + compound.setTag("CloneTags", tagMap.writeNBT()); Server.sendData(player, EnumPacketClient.GUI_DATA, compound); } else