From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Sun, 24 Sep 2023 15:09:27 -0500 Subject: [PATCH] UUID validation diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java index b65dcff9812dbc3256c080ac264c4aafd83ce276..82b53a7bfb37bfa1752a016a8a454c0b994b9108 100644 --- a/src/main/java/net/minecraft/nbt/NbtUtils.java +++ b/src/main/java/net/minecraft/nbt/NbtUtils.java @@ -74,7 +74,11 @@ public final class NbtUtils { UUID uUID = nbt.hasUUID("Id") ? nbt.getUUID("Id") : Util.NIL_UUID; // Paper start - support string UUID's if (nbt.contains("Id", Tag.TAG_STRING)) { - uUID = UUID.fromString(nbt.getString("Id")); + // Scissors start - Validate String UUIDs in game profiles + try { + uUID = UUID.fromString(nbt.getString("Id")); + } catch (Exception ignored) {} + // Scissors end } // Paper end String string = nbt.getString("Name"); diff --git a/src/main/java/net/minecraft/network/chat/HoverEvent.java b/src/main/java/net/minecraft/network/chat/HoverEvent.java index 3ad05bbab726c59e7b67d9614af4b208d4520cb3..c0633f9553fb5aa52e8ffc863159521d09cb3bd5 100644 --- a/src/main/java/net/minecraft/network/chat/HoverEvent.java +++ b/src/main/java/net/minecraft/network/chat/HoverEvent.java @@ -174,7 +174,14 @@ public class HoverEvent { } else { JsonObject jsonObject = json.getAsJsonObject(); EntityType entityType = BuiltInRegistries.ENTITY_TYPE.get(new ResourceLocation(GsonHelper.getAsString(jsonObject, "type"))); - UUID uUID = UUID.fromString(GsonHelper.getAsString(jsonObject, "id")); + // Scissors start + UUID uUID; + try { + uUID = UUID.fromString(GsonHelper.getAsString(jsonObject, "id")); + } catch (Exception ex) { + return null; + } + // Scissors end Component component = Component.Serializer.fromJson(jsonObject.get("name")); return new HoverEvent.EntityTooltipInfo(entityType, uUID, component); } @@ -186,7 +193,14 @@ public class HoverEvent { CompoundTag compoundTag = TagParser.parseTag(text.getString()); Component component = Component.Serializer.fromJson(compoundTag.getString("name")); EntityType entityType = BuiltInRegistries.ENTITY_TYPE.get(new ResourceLocation(compoundTag.getString("type"))); - UUID uUID = UUID.fromString(compoundTag.getString("id")); + // Scissors start + UUID uUID; + try { + uUID = UUID.fromString(compoundTag.getString("id")); + } catch (Exception ex) { + return null; + } + // Scissors end return new HoverEvent.EntityTooltipInfo(entityType, uUID, component); } catch (Exception var5) { return null;