From a1c182f2915207adcc8d6c02bf88ffd20479639f Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Fri, 26 Apr 2024 10:01:29 +0200
Subject: [PATCH] Ignore invalid names in the data component for hover events
 as well

---
 .../BlockItemPacketRewriter1_20_5.java        | 30 ++++++++++++++++---
 .../rewriter/ComponentRewriter1_20_5.java     |  4 ++-
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
index 8fd27b415..b92c48571 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
@@ -1203,10 +1203,15 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
     private void updateProfile(final StructuredDataContainer data, final Tag skullOwnerTag) {
         if (skullOwnerTag instanceof StringTag) {
             final String name = ((StringTag) skullOwnerTag).getValue();
-            data.set(StructuredDataKey.PROFILE, new GameProfile(name, null, EMPTY_PROPERTIES));
+            if (isValidName(name)) {
+                data.set(StructuredDataKey.PROFILE, new GameProfile(name, null, EMPTY_PROPERTIES));
+            }
         } else if (skullOwnerTag instanceof CompoundTag) {
             final CompoundTag skullOwner = (CompoundTag) skullOwnerTag;
-            final String name = skullOwner.getString("Name", "");
+            String name = skullOwner.getString("Name", "");
+            if (!isValidName(name)) {
+                name = null;
+            }
 
             final IntArrayTag idTag = skullOwner.getIntArrayTag("Id");
             UUID uuid = null;
@@ -1219,7 +1224,8 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
             if (propertiesTag != null) {
                 updateProperties(propertiesTag, properties);
             }
-            data.set(StructuredDataKey.PROFILE, new GameProfile(limit(name, 16), uuid, properties.toArray(EMPTY_PROPERTIES)));
+
+            data.set(StructuredDataKey.PROFILE, new GameProfile(name, uuid, properties.toArray(EMPTY_PROPERTIES)));
         }
     }
 
@@ -1440,7 +1446,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
         tag.put("profile", profileTag);
 
         final String name = skullOwnerTag.getString("Name");
-        if (name != null && name.length() <= 16 && name.indexOf(' ') == -1) { // Ignore invalid names
+        if (name != null && isValidName(name)) {
             profileTag.putString("name", name);
         }
 
@@ -1481,4 +1487,20 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
 
         profileTag.put("properties", propertiesListTag);
     }
+
+    private boolean isValidName(final String name) {
+        // Ignore invalid player profile names
+        if (name.length() > 16) {
+            return false;
+        }
+
+        for (int i = 0, len = name.length(); i < len; ++i) {
+            final char c = name.charAt(i);
+            if (c < '!' || c > '~') {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }
\ No newline at end of file
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/ComponentRewriter1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/ComponentRewriter1_20_5.java
index 28808e929..6228e64f5 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/ComponentRewriter1_20_5.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/ComponentRewriter1_20_5.java
@@ -167,7 +167,9 @@ public class ComponentRewriter1_20_5 extends ComponentRewriter<ClientboundPacket
     @Override
     protected void handleHoverEvent(final UserConnection connection, final CompoundTag hoverEventTag) {
         final StringTag actionTag = hoverEventTag.getStringTag("action");
-        if (actionTag == null) return;
+        if (actionTag == null) {
+            return;
+        }
 
         if (actionTag.getValue().equals("show_item")) {
             final Tag valueTag = hoverEventTag.remove("value");