2016-03-16 07:21:39 +00:00
|
|
|
From f26a3e651b2b6e67203bf6e078d0f1f510c1965e Mon Sep 17 00:00:00 2001
|
2015-08-11 06:27:18 +00:00
|
|
|
From: Techcable <Techcable@outlook.com>
|
2016-02-29 23:09:49 +00:00
|
|
|
Date: Wed, 2 Mar 2016 23:42:37 -0600
|
2015-08-11 06:27:18 +00:00
|
|
|
Subject: [PATCH] Use UserCache for player heads
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
|
2016-02-29 23:09:49 +00:00
|
|
|
index 2abca0c..7d83bbe 100644
|
2015-08-11 06:27:18 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
|
2016-02-29 23:09:49 +00:00
|
|
|
@@ -2,9 +2,7 @@ package org.bukkit.craftbukkit.inventory;
|
|
|
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
|
|
|
-import net.minecraft.server.GameProfileSerializer;
|
|
|
|
-import net.minecraft.server.NBTBase;
|
|
|
|
-import net.minecraft.server.NBTTagCompound;
|
|
|
|
+import net.minecraft.server.*;
|
2015-08-15 19:05:03 +00:00
|
|
|
|
|
|
|
import org.bukkit.Material;
|
|
|
|
import org.bukkit.configuration.serialization.DelegateDeserialization;
|
2016-02-29 23:09:49 +00:00
|
|
|
@@ -132,7 +130,10 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
|
2015-08-11 06:27:18 +00:00
|
|
|
if (name == null) {
|
|
|
|
profile = null;
|
|
|
|
} else {
|
|
|
|
- profile = new GameProfile(null, name);
|
2016-02-29 23:09:49 +00:00
|
|
|
+ // Paper start - Check usercache if the player is online
|
2015-08-15 19:05:03 +00:00
|
|
|
+ EntityPlayer player = MinecraftServer.getServer().getPlayerList().getPlayer(name);
|
|
|
|
+ profile = player != null ? player.getProfile() : new GameProfile(null, name);
|
2016-02-29 23:09:49 +00:00
|
|
|
+ // Paper end
|
2015-08-11 06:27:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
--
|
2016-02-29 23:09:49 +00:00
|
|
|
2.7.2
|
2015-08-11 06:27:18 +00:00
|
|
|
|