SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix null pointer issue with async skull converting

Browse Source
This commit is contained in:
Thinkofdeath
2015-03-07 15:48:05 +00:00
parent a93c6f2875
commit fc2a701b92
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CraftBukkit-Patches/0113-Convert-player-skulls-async.patch
View File

@@ -157,18 +157,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- if (gameprofile1 == null) { - if (gameprofile1 == null) {
- return gameprofile; - return gameprofile;
+ GameProfile profile = skinCache.getIfPresent(gameprofile.getName()); + GameProfile profile = skinCache.getIfPresent(gameprofile.getName());
+ if (profile != null) { + if (profile != null && Iterables.getFirst(profile.getProperties().get("textures"), (Object) null) != null) {
+ callback.apply(profile); + callback.apply(profile);
} else { } else {
- Property property = (Property) Iterables.getFirst(gameprofile1.getProperties().get("textures"), (Object) null); - Property property = (Property) Iterables.getFirst(gameprofile1.getProperties().get("textures"), (Object) null);
+ Property property = (Property) Iterables.getFirst(profile.getProperties().get("textures"), (Object) null); -
- if (property == null) { - if (property == null) {
- gameprofile1 = MinecraftServer.getServer().aC().fillProfileProperties(gameprofile1, true); - gameprofile1 = MinecraftServer.getServer().aC().fillProfileProperties(gameprofile1, true);
+ if (property != null) { - }
+ callback.apply(profile);
+ return;
}
- -
- return gameprofile1; - return gameprofile1;
+ executor.execute(new Runnable() { + executor.execute(new Runnable() {