testserver/Spigot-Server-Patches/0044-Use-UserCache-for-play...

36 lines
1.6 KiB
Diff
Raw Normal View History

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