From 6e2518cfc4d6b5c999c16e7e2fd5d24309657cca Mon Sep 17 00:00:00 2001 From: Robotia Date: Tue, 26 Jan 2016 23:17:38 -0500 Subject: [PATCH] PaperSpigot fix (https://github.com/PaperSpigot/Paper/commit/25a137f3a3ad4b2eed21d8b0d6bb46fdc84c19af) --- .../bukkit/craftbukkit/inventory/CraftMetaSkull.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java index dcefc9b..3abfc83 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java @@ -12,6 +12,11 @@ import org.bukkit.configuration.serialization.DelegateDeserialization; import org.bukkit.craftbukkit.inventory.CraftMetaItem.SerializableMeta; import org.bukkit.inventory.meta.SkullMeta; +// PaperSpigot start +import net.minecraft.server.EntityPlayer; +import net.minecraft.server.MinecraftServer; +// PaperSpigot end + import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap.Builder; @@ -97,8 +102,10 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { if (name == null) { profile = null; } else { - profile = net.minecraft.server.MinecraftServer.getServer().func_152358_ax().func_152655_a(name); - if (profile == null) profile = new GameProfile(null, name); + // PaperSpigot - Check usercache if the player is online + EntityPlayer player = MinecraftServer.getServer().getPlayerList().getPlayer(name); + profile = player != null ? player.getProfile() : new GameProfile(null, name); + // PaperSpigot end } return true;