mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-01 08:20:51 +01:00
de04cbced5
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: f29cb801 Separate checkstyle-suppressions file is not required 86f99bbe SPIGOT-7540, PR-946: Add ServerTickManager API d4119585 SPIGOT-6903, PR-945: Add BlockData#getMapColor b7a2ed41 SPIGOT-7530, PR-947: Add Player#removeResourcePack 9dd56255 SPIGOT-7527, PR-944: Add WindCharge#explode() 994a6163 Attempt upgrade of resolver libraries CraftBukkit Changes: b3b43a6ad Add Checkstyle check for unused imports 13fb3358e SPIGOT-7544: Scoreboard#getEntries() doesn't get entries but class names 3dda99c06 SPIGOT-7540, PR-1312: Add ServerTickManager API 2ab4508c0 SPIGOT-6903, PR-1311: Add BlockData#getMapColor 1dbdbbed4 PR-1238: Remove unnecessary sign ticking 659728d2a MC-264285, SPIGOT-7439, PR-1237: Fix unbreakable flint and steel is completely consumed while igniting creeper e37e29ce0 Increase outdated build delay c00438b39 SPIGOT-7530, PR-1313: Add Player#removeResourcePack 492dd80ce SPIGOT-7527, PR-1310: Add WindCharge#explode() e11fbb9d7 Upgrade MySQL driver 9f3a0bd2a Attempt upgrade of resolver libraries 60d16d7ca PR-1306: Centralize Bukkit and Minecraft entity conversion Spigot Changes: 06d602e7 Rebuild patches
64 lines
2.7 KiB
Diff
64 lines
2.7 KiB
Diff
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
|
|
index 135530bc9d7ecd0348ace6474f4ca6d2e1bad283..e464ada187fd1f15efef29a0e5033aeb0c688059 100644
|
|
--- a/src/main/java/net/minecraft/nbt/CompoundTag.java
|
|
+++ b/src/main/java/net/minecraft/nbt/CompoundTag.java
|
|
@@ -237,6 +237,12 @@ public class CompoundTag implements Tag {
|
|
}
|
|
|
|
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));
|
|
}
|
|
|
|
@@ -245,10 +251,20 @@ public class CompoundTag implements Tag {
|
|
* You must use {@link #hasUUID(String)} before or else it <b>will</b> throw an NPE.
|
|
*/
|
|
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;
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/nbt/NbtUtils.java b/src/main/java/net/minecraft/nbt/NbtUtils.java
|
|
index 4388f2a8b05f5ed2f0934c1693299a4c92072adc..b65dcff9812dbc3256c080ac264c4aafd83ce276 100644
|
|
--- a/src/main/java/net/minecraft/nbt/NbtUtils.java
|
|
+++ b/src/main/java/net/minecraft/nbt/NbtUtils.java
|
|
@@ -72,6 +72,11 @@ public final class NbtUtils {
|
|
@Nullable
|
|
public static GameProfile readGameProfile(CompoundTag nbt) {
|
|
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"));
|
|
+ }
|
|
+ // Paper end
|
|
String string = nbt.getString("Name");
|
|
|
|
try {
|