mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-27 04:55:47 +01:00
c0936a71bd
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: 01aa02eb PR-858: Add LivingEntity#playHurtAnimation() 9421320f PR-884: Refinements to new ban API for improved compatibility and correctness 37a60b45 SPIGOT-6455, SPIGOT-7030, PR-750: Improve ban API 4eeb174b All smithing inventories are now the new smithing inventory f2bb168e PR-880: Add methods to get/set FallingBlock CancelDrop e7a807fa PR-879: Add Player#sendHealthUpdate() 692b8e96 SPIGOT-7370: Remove float value conversion in plugin.yml 2d033390 SPIGOT-7403: Add direct API for waxed signs 16a08373 PR-876: Add missing Raider API and 'no action ticks' CraftBukkit Changes: b60a95c8c PR-1189: Add LivingEntity#playHurtAnimation() 95c335c63 PR-1226: Fix VehicleEnterEvent not being called for certain entities 0a0fc3bee PR-1227: Refinements to new ban API for improved compatibility and correctness 0d0b1e5dc Revert bad change to PathfinderGoalSit causing all cats to sit 648196070 SPIGOT-6455, SPIGOT-7030, PR-1054: Improve ban API 31fe848d6 All smithing inventories are now the new smithing inventory 9a919a143 SPIGOT-7416: SmithItemEvent not firing in Smithing Table 9f64f0d22 PR-1221: Add methods to get/set FallingBlock CancelDrop 3be9ac171 PR-1220: Add Player#sendHealthUpdate() c1279f775 PR-1209: Clean up various patches c432e4397 Fix Raider#setCelebrating() implementation 504d96665 SPIGOT-7403: Add direct API for waxed signs c68c1f1b3 PR-1216: Add missing Raider API and 'no action ticks' 85b89c3dd Increase outdated build delay Spigot Changes: 9ebce8af Rebuild patches 64b565e6 Rebuild patches
64 lines
2.6 KiB
Diff
64 lines
2.6 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 1d13bc15c56faa69699fb3ad39210233d6b6934d..7e94ebe06fc62293e665d6db19e42d947e7eb30f 100644
|
|
--- a/src/main/java/net/minecraft/nbt/CompoundTag.java
|
|
+++ b/src/main/java/net/minecraft/nbt/CompoundTag.java
|
|
@@ -196,6 +196,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));
|
|
}
|
|
|
|
@@ -204,10 +210,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 1e7ba8d82269d2d375b2f2d3fc21ed922cce0942..7bc60901297d27d88efb401d02b4bc06d8b28874 100644
|
|
--- a/src/main/java/net/minecraft/nbt/NbtUtils.java
|
|
+++ b/src/main/java/net/minecraft/nbt/NbtUtils.java
|
|
@@ -76,6 +76,11 @@ public final class NbtUtils {
|
|
if (nbt.contains("Name", 8)) {
|
|
string = nbt.getString("Name");
|
|
}
|
|
+ // Paper start - support string UUID's
|
|
+ if (nbt.contains("Id", 8)) {
|
|
+ uUID = UUID.fromString(nbt.getString("Id"));
|
|
+ }
|
|
+ // Paper end
|
|
|
|
if (nbt.hasUUID("Id")) {
|
|
uUID = nbt.getUUID("Id");
|