2017-04-22 08:16:45 +02:00
|
|
|
From 526ed5df91f1b0ca392b4707f6aa7a8384c27acd Mon Sep 17 00:00:00 2001
|
2015-08-11 08:27:18 +02:00
|
|
|
From: Techcable <Techcable@outlook.com>
|
2016-03-01 00:09:49 +01:00
|
|
|
Date: Wed, 2 Mar 2016 23:42:37 -0600
|
2015-08-11 08:27:18 +02: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
|
2017-03-25 06:22:02 +01:00
|
|
|
index f07eb2f75..18cc74639 100644
|
2015-08-11 08:27:18 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
|
2016-11-22 00:00:40 +01:00
|
|
|
@@ -6,6 +6,7 @@ import net.minecraft.server.GameProfileSerializer;
|
|
|
|
import net.minecraft.server.NBTBase;
|
|
|
|
import net.minecraft.server.NBTTagCompound;
|
|
|
|
import net.minecraft.server.TileEntitySkull;
|
2016-03-01 00:09:49 +01:00
|
|
|
+import net.minecraft.server.*;
|
2015-08-15 21:05:03 +02:00
|
|
|
|
|
|
|
import org.bukkit.Material;
|
|
|
|
import org.bukkit.configuration.serialization.DelegateDeserialization;
|
2016-11-22 00:00:40 +01:00
|
|
|
@@ -133,8 +134,12 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
|
2015-08-11 08:27:18 +02:00
|
|
|
if (name == null) {
|
|
|
|
profile = null;
|
|
|
|
} else {
|
2016-11-22 00:00:40 +01:00
|
|
|
+ // Paper start - Use Online Players Skull
|
2015-08-15 21:05:03 +02:00
|
|
|
+ EntityPlayer player = MinecraftServer.getServer().getPlayerList().getPlayer(name);
|
2016-11-22 00:00:40 +01:00
|
|
|
+ if (profile == null && player != null) profile = player.getProfile();
|
2016-03-01 00:09:49 +01:00
|
|
|
+ // Paper end
|
2016-11-22 00:00:40 +01:00
|
|
|
// Spigot start
|
|
|
|
- profile = TileEntitySkull.skinCache.getIfPresent(name.toLowerCase(java.util.Locale.ROOT));
|
|
|
|
+ if (profile == null) profile = TileEntitySkull.skinCache.getIfPresent(name.toLowerCase(java.util.Locale.ROOT)); // Paper
|
|
|
|
if (profile == null) profile = new GameProfile(null, name);
|
|
|
|
// Spigot end
|
2015-08-11 08:27:18 +02:00
|
|
|
}
|
|
|
|
--
|
2017-04-22 08:16:45 +02:00
|
|
|
2.12.2
|
2015-08-11 08:27:18 +02:00
|
|
|
|