From f68b2ab95e1d90227699a3cec152ebbb20cf32cf Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 22 Apr 2017 17:41:28 -0500 Subject: [PATCH] Update upstream CB/S --- .../0044-Use-UserCache-for-player-heads.patch | 6 +++--- work/CraftBukkit | 2 +- work/Spigot | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Spigot-Server-Patches/0044-Use-UserCache-for-player-heads.patch b/Spigot-Server-Patches/0044-Use-UserCache-for-player-heads.patch index b5be8d9aea..f066f3e7f5 100644 --- a/Spigot-Server-Patches/0044-Use-UserCache-for-player-heads.patch +++ b/Spigot-Server-Patches/0044-Use-UserCache-for-player-heads.patch @@ -1,11 +1,11 @@ -From 526ed5df91f1b0ca392b4707f6aa7a8384c27acd Mon Sep 17 00:00:00 2001 +From bf24caf82339d24a9c4a6fd4ef31cdb3c7496d1b Mon Sep 17 00:00:00 2001 From: Techcable 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 +index c0c4f8e7d..8c81544f0 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; @@ -16,7 +16,7 @@ index f07eb2f75..18cc74639 100644 import org.bukkit.Material; import org.bukkit.configuration.serialization.DelegateDeserialization; -@@ -133,8 +134,12 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { +@@ -134,8 +135,12 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { if (name == null) { profile = null; } else { diff --git a/work/CraftBukkit b/work/CraftBukkit index 7b044defc0..c19c2932bf 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 7b044defc0a7ab4dbf5fe22cdf3d885ce5de7572 +Subproject commit c19c2932bf14b62a6d31266c8ccd9003bfe05e91 diff --git a/work/Spigot b/work/Spigot index 54ec0b8b50..9ba269b5ea 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 54ec0b8b502d298334e7011c0a5065777e22421b +Subproject commit 9ba269b5ea33a2a71a58a011f514801e6cb1afc7