PaperMC/patches/server/0438-Support-old-UUID-format-for-NBT.patch

64 lines
2.6 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Jun 2020 03:26:17 -0400
Subject: [PATCH] Support old UUID format for NBT
We have stored UUID in plenty of places that did not get DFU'd
So just look for old format and load it if it exists.
diff --git a/src/main/java/net/minecraft/nbt/CompoundTag.java b/src/main/java/net/minecraft/nbt/CompoundTag.java
2022-05-29 21:54:25 +02:00
index 0778fdd4f47015787f7ffbfb39c31ec0e1c039bd..912fd5135e89348bdd3c0a8b6c07860ebc106df3 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/nbt/CompoundTag.java
+++ b/src/main/java/net/minecraft/nbt/CompoundTag.java
2022-05-29 21:54:25 +02:00
@@ -181,6 +181,12 @@ public class CompoundTag implements Tag {
2021-06-17 23:39:36 +02:00
}
2021-06-11 14:02:28 +02:00
public void putUUID(String key, UUID value) {
+ // Paper start - support old format
+ if (this.contains(key + "Most", 99) && this.contains(key + "Least", 99)) {
+ this.tags.remove(key + "Most");
+ this.tags.remove(key + "Least");
+ }
+ // Paper end
this.tags.put(key, NbtUtils.createUUID(value));
}
2022-05-29 21:54:25 +02:00
@@ -189,10 +195,20 @@ public class CompoundTag implements Tag {
* You must use {@link #hasUUID(String)} before or else it <b>will</b> throw an NPE.
2021-06-11 14:02:28 +02:00
*/
public UUID getUUID(String key) {
+ // Paper start - support old format
+ if (!contains(key, 11) && this.contains(key + "Most", 99) && this.contains(key + "Least", 99)) {
+ return new UUID(this.getLong(key + "Most"), this.getLong(key + "Least"));
+ }
+ // Paper end
return NbtUtils.loadUUID(this.get(key));
}
public boolean hasUUID(String key) {
+ // Paper start - support old format
+ if (this.contains(key + "Most", 99) && this.contains(key + "Least", 99)) {
+ return true;
+ }
+ // Paper end
Tag tag = this.get(key);
return tag != null && tag.getType() == IntArrayTag.TYPE && ((IntArrayTag)tag).getAsIntArray().length == 4;
}
2021-06-11 14:02:28 +02:00
diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java
2022-07-27 22:46:05 +02:00
index d6d8adf1e49cdb74dc5d8e2e60bcaca7c5e1c16d..b31741a9c3363e4288636ceff9b38c598a84aa43 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/nbt/NbtUtils.java
+++ b/src/main/java/net/minecraft/nbt/NbtUtils.java
2022-07-27 22:46:05 +02:00
@@ -75,6 +75,11 @@ public final class NbtUtils {
2022-06-08 07:46:52 +02:00
if (nbt.contains("Name", 8)) {
string = nbt.getString("Name");
2021-06-11 14:02:28 +02:00
}
+ // Paper start - support string UUID's
2022-06-08 10:45:59 +02:00
+ if (nbt.contains("Id", 8)) {
+ uUID = UUID.fromString(nbt.getString("Id"));
2021-06-11 14:02:28 +02:00
+ }
+ // Paper end
2022-06-08 07:46:52 +02:00
if (nbt.hasUUID("Id")) {
uUID = nbt.getUUID("Id");