From 2aca63ddef90205f8f2e63d8bf8f9c9cfd291939 Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> Date: Sat, 22 Apr 2017 17:41:28 -0500 Subject: [PATCH] Update upstream CB/S --- Spigot-Server-Patches/Use-UserCache-for-player-heads.patch | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Spigot-Server-Patches/Use-UserCache-for-player-heads.patch b/Spigot-Server-Patches/Use-UserCache-for-player-heads.patch index 902cc5d17..90800983d 100644 --- a/Spigot-Server-Patches/Use-UserCache-for-player-heads.patch +++ b/Spigot-Server-Patches/Use-UserCache-for-player-heads.patch @@ -5,7 +5,7 @@ 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 @@ -0,0 +0,0 @@ import net.minecraft.server.GameProfileSerializer; diff --git a/work/CraftBukkit b/work/CraftBukkit index 7b044defc..c19c2932b 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 7b044defc0a7ab4dbf5fe22cdf3d885ce5de7572 +Subproject commit c19c2932bf14b62a6d31266c8ccd9003bfe05e91 diff --git a/work/Spigot b/work/Spigot index 54ec0b8b5..9ba269b5e 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 54ec0b8b502d298334e7011c0a5065777e22421b +Subproject commit 9ba269b5ea33a2a71a58a011f514801e6cb1afc7