mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 19:52:55 +01:00
54dd19b818
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 18cda936 Fix variant of unloadChunkRequest that was incorrectly never deprecated 00763e1b Deprecate some methods 35a83d54 SPIGOT-4572: Make default no permission message clearer 6163343d Fix some misplaced material enum entries 8736469c Fix typo in TechnicalPiston documentation CraftBukkit Changes:0c715b32SPIGOT-4579: Shulker boxes not dropping in creative50fbc3f1SPIGOT-4576: Fix attributes in itemstack internal data being lost8059a937SPIGOT-4577: Fix loss of int/double custom tags when serialized to yaml07e504c3Clarify exception thrown when setting drop chance for player inventory98b862adFix duplicate iron golem add843cee65Fix a bunch of duplicate EntityCombustEvent calls43855624SPIGOT-4571: EntityCombustEvent not firing for phantoms
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From dd9bce188d61c465ad634806702418c5a6347418 Mon Sep 17 00:00:00 2001
|
|
From: Techcable <Techcable@outlook.com>
|
|
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 210c10b317..2ad3acf43b 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
|
|
@@ -6,6 +6,7 @@ import net.minecraft.server.GameProfileSerializer;
|
|
import net.minecraft.server.NBTBase;
|
|
import net.minecraft.server.NBTTagCompound;
|
|
import net.minecraft.server.TileEntitySkull;
|
|
+import net.minecraft.server.*;
|
|
|
|
import org.bukkit.Bukkit;
|
|
import org.bukkit.Material;
|
|
@@ -155,7 +156,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
|
|
if (name == null) {
|
|
profile = null;
|
|
} else {
|
|
- profile = new GameProfile(null, name);
|
|
+ // Paper start - Use Online Players Skull
|
|
+ GameProfile newProfile = null;
|
|
+ EntityPlayer player = MinecraftServer.getServer().getPlayerList().getPlayer(name);
|
|
+ if (player != null) newProfile = player.getProfile();
|
|
+ if (newProfile == null) newProfile = new GameProfile(null, name);
|
|
+ profile = newProfile;
|
|
+ // Paper end
|
|
}
|
|
|
|
return true;
|
|
--
|
|
2.20.1
|
|
|