diff options
Diffstat (limited to 'Spigot-Server-Patches/0514-Support-old-UUID-format-for-NBT.patch')
| -rw-r--r-- | Spigot-Server-Patches/0514-Support-old-UUID-format-for-NBT.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Spigot-Server-Patches/0514-Support-old-UUID-format-for-NBT.patch b/Spigot-Server-Patches/0514-Support-old-UUID-format-for-NBT.patch index f33e33ece5..8ba6c36f4a 100644 --- a/Spigot-Server-Patches/0514-Support-old-UUID-format-for-NBT.patch +++ b/Spigot-Server-Patches/0514-Support-old-UUID-format-for-NBT.patch @@ -24,7 +24,7 @@ index 0560d115288c67e46d921ce529e603f424e601f5..50515cd9287505fcc8ab52e47393fb1d uuid = nbttagcompound.a("Id"); } diff --git a/src/main/java/net/minecraft/nbt/NBTTagCompound.java b/src/main/java/net/minecraft/nbt/NBTTagCompound.java -index e37c82c3af7c0fea9c85f7bc8d7a4df648e723ff..b8a0bbac91c64254f7d4b0661a2365b6ece9bbc7 100644 +index 77afbaad5b2cb8d912f5404fcbd3a0970490f4f3..945df83d4a2170cdcc29cb6d7b9f0f5f3940cb96 100644 --- a/src/main/java/net/minecraft/nbt/NBTTagCompound.java +++ b/src/main/java/net/minecraft/nbt/NBTTagCompound.java @@ -142,6 +142,12 @@ public class NBTTagCompound implements NBTBase { @@ -40,9 +40,9 @@ index e37c82c3af7c0fea9c85f7bc8d7a4df648e723ff..b8a0bbac91c64254f7d4b0661a2365b6 this.map.put(s, GameProfileSerializer.a(uuid)); } -@@ -149,11 +155,21 @@ public class NBTTagCompound implements NBTBase { - @Nullable public UUID getUUID(String prefix) { return a(prefix); } // Paper - OBFHELPER - @Nullable +@@ -151,11 +157,21 @@ public class NBTTagCompound implements NBTBase { + */ + public UUID getUUID(String prefix) { return a(prefix); } // Paper - OBFHELPER public UUID a(String s) { + // Paper start - support old format + if (!hasKeyOfType(s, 11) && this.hasKeyOfType(s + "Most", 99) && this.hasKeyOfType(s + "Least", 99)) { |