Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-11 10:01:55 +01:00
Code Issues Projects Releases Wiki Activity

[CI-SKIP] Remove bad null annotation (#5538)

Browse Source
This commit is contained in:
Jake Potrebic 2021-04-23 14:08:56 -07:00
parent 99eeb79087
commit 98eb2c8d94
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/MC-Utils.patch
View File

@ -2397,8 +2397,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
+ +
+ @Nullable public UUID getUUID(String prefix) { return a(prefix); } // Paper - OBFHELPER + /**
+ @Nullable + * You must use {@link #hasUUID(String)} before or else it <b>will</b> throw an NPE.
+ */
+ public UUID getUUID(String prefix) { return a(prefix); } // Paper - OBFHELPER
public UUID a(String s) { public UUID a(String s) {
return GameProfileSerializer.a(this.get(s)); return GameProfileSerializer.a(this.get(s));
} }

4
Spigot-Server-Patches/Support-old-UUID-format-for-NBT.patch
View File

@ -41,8 +41,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
@@ -0,0 +0,0 @@ public class NBTTagCompound implements NBTBase { @@ -0,0 +0,0 @@ public class NBTTagCompound implements NBTBase {
@Nullable public UUID getUUID(String prefix) { return a(prefix); } // Paper - OBFHELPER */
@Nullable public UUID getUUID(String prefix) { return a(prefix); } // Paper - OBFHELPER
public UUID a(String s) { public UUID a(String s) {
+ // Paper start - support old format + // Paper start - support old format
+ if (!hasKeyOfType(s, 11) && this.hasKeyOfType(s + "Most", 99) && this.hasKeyOfType(s + "Least", 99)) { + if (!hasKeyOfType(s, 11) && this.hasKeyOfType(s + "Most", 99) && this.hasKeyOfType(s + "Least", 99)) {