OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-01 17:01:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix supporting more places of the old UUID format

Browse source 
Fixes #3734
This commit is contained in:
Aikar 2020-07-01 03:13:57 -04:00
parent 174c81a963
commit d9bdfa4aa2
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Spigot-Server-Patches/Fix-client-rendering-skulls-from-same-user.patch
View file

@ -39,8 +39,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ // Paper start + // Paper start
+ if (nbttagcompound != null && nbttagcompound.hasKeyOfType("SkullOwner", 10)) { + if (nbttagcompound != null && nbttagcompound.hasKeyOfType("SkullOwner", 10)) {
+ NBTTagCompound owner = nbttagcompound.getCompound("SkullOwner"); + NBTTagCompound owner = nbttagcompound.getCompound("SkullOwner");
+ if (owner.hasKey("Id")) { + if (owner.hasUUID("Id")) {
+ nbttagcompound.map.put("SkullOwnerOrig", owner.map.get("Id")); + nbttagcompound.setUUID("SkullOwnerOrig", owner.getUUID("Id"));
+ TileEntitySkull.sanitizeUUID(owner); + TileEntitySkull.sanitizeUUID(owner);
+ } + }
+ } + }

10
Spigot-Server-Patches/Support-old-UUID-format-for-NBT.patch
View file

@ -23,3 +23,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
return GameProfileSerializer.a(this.get(s)); return GameProfileSerializer.a(this.get(s));
} }
public final boolean hasUUID(String s) { return this.b(s); } // Paper - OBFHELPER
public boolean b(String s) {
+ // Paper start - support old format
+ if (hasKey(s + "Least") && hasKey(s + "Most")) {
+ return true;
+ }
+ // Paper end
NBTBase nbtbase = this.get(s);
return nbtbase != null && nbtbase.b() == NBTTagIntArray.a && ((NBTTagIntArray) nbtbase).getInts().length == 4;