Paper/Spigot-Server-Patches/0044-Use-UserCache-for-player-heads.patch

36 lines
1.6 KiB
Diff
Raw Normal View History

2017-04-23 00:41:28 +02:00
From bf24caf82339d24a9c4a6fd4ef31cdb3c7496d1b Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
2016-03-01 00:09:49 +01: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
2017-04-23 00:41:28 +02:00
index c0c4f8e7d..8c81544f0 100644
--- 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.*;
import org.bukkit.Material;
import org.bukkit.configuration.serialization.DelegateDeserialization;
2017-04-23 00:41:28 +02:00
@@ -134,8 +135,12 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
if (name == null) {
profile = null;
} else {
2016-11-22 00:00:40 +01:00
+ // Paper start - Use Online Players Skull
+ 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
}
--
2017-04-22 08:16:45 +02:00
2.12.2