From 31aa97180bc51617f80b2e8595bedd72477b5e5e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 1 Jan 2018 16:29:33 -0500
Subject: [PATCH] Update Upstream

---
 .../Don-t-tick-Skulls-unused-code.patch               |  6 +++---
 .../Use-UserCache-for-player-heads.patch              | 11 +++++------
 work/CraftBukkit                                      |  2 +-
 work/Spigot                                           |  2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Spigot-Server-Patches/Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/Don-t-tick-Skulls-unused-code.patch
index 2023b34ae7..3f9bd8972e 100644
--- a/Spigot-Server-Patches/Don-t-tick-Skulls-unused-code.patch
+++ b/Spigot-Server-Patches/Don-t-tick-Skulls-unused-code.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Don't tick Skulls - unused code
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
-index 8d2ab289..ccdea51c 100644
+index 1e3c687d6..ba02a17e0 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
-@@ -0,0 +0,0 @@ import com.mojang.authlib.Agent;
- import com.mojang.authlib.ProfileLookupCallback;
+@@ -0,0 +0,0 @@ import com.mojang.authlib.ProfileLookupCallback;
+ import java.util.concurrent.Callable;
  // Spigot end
  
 -public class TileEntitySkull extends TileEntity implements ITickable {
diff --git a/Spigot-Server-Patches/Use-UserCache-for-player-heads.patch b/Spigot-Server-Patches/Use-UserCache-for-player-heads.patch
index 610a3dcd89..bed49e2017 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 4976eb26a..a04b3a9e6 100644
+index 8a58615f8..987cc9a80 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;
@@ -20,14 +20,13 @@ index 4976eb26a..a04b3a9e6 100644
          if (name == null) {
              profile = null;
          } else {
+-            profile = new GameProfile(null, name);
 +            // Paper start - Use Online Players Skull
 +            EntityPlayer player = MinecraftServer.getServer().getPlayerList().getPlayer(name);
 +            if (profile == null && player != null) profile = player.getProfile();
++            if (profile == null) profile = new GameProfile(null, name);
 +            // Paper end
-             // 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
          }
+ 
+         return true;
 --
\ No newline at end of file
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 950006003c..595eaaa8be 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 950006003c4f57ca4ac61280c93fdc5ba747ce20
+Subproject commit 595eaaa8be13eaf09967819bb60a69aba802fe51
diff --git a/work/Spigot b/work/Spigot
index b66ad9eed1..bb614f8414 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit b66ad9eed1a41a533e0d7ccf4b7aecfea7a06222
+Subproject commit bb614f841467a4bfa110bbed2c9fbc638bc68369