From 08f6b3ce365225384a72d79e61a139eaeb6aa7f9 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Thu, 19 Oct 2023 12:13:44 +1000
Subject: [PATCH] Only remove id field if it actually is a uuid

---
 .../Protocol1_20_3To1_20_2.java                       | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/Protocol1_20_3To1_20_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/Protocol1_20_3To1_20_2.java
index 2ca683e9f..fb3434163 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/Protocol1_20_3To1_20_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/Protocol1_20_3To1_20_2.java
@@ -400,9 +400,11 @@ public final class Protocol1_20_3To1_20_2 extends AbstractProtocol<ClientboundPa
         if ((key.equals("contents")) && element.isJsonObject()) {
             // Store show_entity id as int array instead of uuid string
             final JsonObject hoverEvent = element.getAsJsonObject();
-            final JsonElement id = hoverEvent.remove("id");
+            final JsonElement id = hoverEvent.get("id");
             final UUID uuid;
             if (id != null && id.isJsonPrimitive() && (uuid = parseUUID(id.getAsString())) != null) {
+                hoverEvent.remove("id");
+
                 final CompoundTag convertedTag = (CompoundTag) convertToTag(element);
                 convertedTag.put("id", new IntArrayTag(UUIDIntArrayType.uuidToIntArray(uuid)));
                 tag.put(key, convertedTag);
@@ -475,8 +477,10 @@ public final class Protocol1_20_3To1_20_2 extends AbstractProtocol<ClientboundPa
         if ((key.equals("contents")) && tag instanceof CompoundTag) {
             // Back to a UUID string
             final CompoundTag showEntity = (CompoundTag) tag;
-            final Tag idTag = showEntity.remove("id");
+            final Tag idTag = showEntity.get("id");
             if (idTag instanceof IntArrayTag) {
+                showEntity.remove("id");
+
                 final JsonObject convertedElement = (JsonObject) convertToJson(key, tag);
                 convertedElement.addProperty("id", uuidIntsToString(((IntArrayTag) idTag).getValue()));
                 object.add(key, convertedElement);
@@ -484,7 +488,8 @@ public final class Protocol1_20_3To1_20_2 extends AbstractProtocol<ClientboundPa
             }
         }
 
-        object.add(key, convertToJson(key, tag));
+        // "":1 is a valid tag, but not a valid json component
+        object.add(key.isEmpty() ? "text" : key, convertToJson(key, tag));
     }
 
     private static String uuidIntsToString(final int[] parts) {