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

Fix NPE when completing skull lookups without a real owner (Fixes #6052)

Browse Source 
This looks like mojang introduced an NPE however it was previously being
supressed by the future used by the server, we'll just stick to the legacy
behavior of retainining the existing profile of earlier versions
This commit is contained in:
Shane Freeder 2021-07-01 00:10:28 +01:00
parent aa1d49efd6
commit 2143a948be
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/Don-t-complete-skull-lookups-on-main-thread-MC-22743.patch
View File

@ -15,6 +15,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- SkullBlockEntity.profileCache.getAsync(owner.getName(), (gameprofile1) -> { - SkullBlockEntity.profileCache.getAsync(owner.getName(), (gameprofile1) -> {
+ // Paper start + // Paper start
+ SkullBlockEntity.profileCache.getAsync(owner.getName(), (gameprofile) -> { + SkullBlockEntity.profileCache.getAsync(owner.getName(), (gameprofile) -> {
+ if (gameprofile == null) {
+ net.minecraft.server.MinecraftServer.getServer().scheduleOnMain(() -> callback.accept(owner));
+ return;
+ }
+ Runnable runnable = () -> { + Runnable runnable = () -> {
+ GameProfile gameprofile1 = gameprofile; + GameProfile gameprofile1 = gameprofile;
Property property = (Property) Iterables.getFirst(gameprofile1.getProperties().get("textures"), (Object) null); Property property = (Property) Iterables.getFirst(gameprofile1.getProperties().get("textures"), (Object) null);