From 6725d50dcfe48b6808c79c492f3f023328ba6981 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Sat, 11 Jun 2022 00:01:56 -0500 Subject: [PATCH] Create 0017-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch --- ...UUIDs-during-the-CompoundTag-GamePro.patch | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 patches/server/0017-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch diff --git a/patches/server/0017-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch b/patches/server/0017-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch new file mode 100644 index 0000000..24371e3 --- /dev/null +++ b/patches/server/0017-Validate-String-UUIDs-during-the-CompoundTag-GamePro.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Video +Date: Wed, 30 Mar 2022 02:01:55 -0600 +Subject: [PATCH] Validate String UUIDs during the CompoundTag -> GameProfile + conversion process + + +diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java +index 29b8519a1dd954f004bf04145e7246e3d2592b77..c1389a6608f19c9b293755abad97db1cc6b02f3c 100644 +--- a/src/main/java/net/minecraft/nbt/NbtUtils.java ++++ b/src/main/java/net/minecraft/nbt/NbtUtils.java +@@ -76,7 +76,12 @@ public final class NbtUtils { + } + // Paper start - support string UUID's + if (nbt.contains("Id", 8)) { +- 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 +