diff --git a/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch b/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch
index 0d3cff8eb8..061f6be4e9 100644
--- a/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch
+++ b/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch
@@ -1,11 +1,11 @@
-From b76742efb1e1fbab724579730c3790783c0e0b49 Mon Sep 17 00:00:00 2001
+From fa7880f5c79111f17ebb4e4867a538fdb1fcccaa 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 e5b9310ea..e9e2c1445 100644
+index f1e029d33f..2ea2a355ba 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 e5b9310ea..e9e2c1445 100644
  
  import org.bukkit.Bukkit;
  import org.bukkit.Material;
-@@ -152,7 +153,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
+@@ -153,7 +154,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
          if (name == null) {
              profile = null;
          } else {
diff --git a/Spigot-Server-Patches/0230-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/0230-Add-setPlayerProfile-API-for-Skulls.patch
index 41ef4de623..6a4c1b82cc 100644
--- a/Spigot-Server-Patches/0230-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/Spigot-Server-Patches/0230-Add-setPlayerProfile-API-for-Skulls.patch
@@ -1,4 +1,4 @@
-From 76ebd2cdd3c93a57562e1fd0ca13ef9a5266a599 Mon Sep 17 00:00:00 2001
+From ac73630f97d04bdd4fd32912d003adfca23759d3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 19 Jan 2018 00:36:25 -0500
 Subject: [PATCH] Add setPlayerProfile API for Skulls
@@ -7,7 +7,7 @@ This allows you to create already filled textures on Skulls to avoid texture loo
 which commonly cause rate limit issues with Mojang API
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
-index f113da713a..fdfe101ae3 100644
+index ad7a2dd170..207546f03a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
 @@ -1,5 +1,7 @@
@@ -18,16 +18,16 @@ index f113da713a..fdfe101ae3 100644
  import com.google.common.base.Preconditions;
  import com.mojang.authlib.GameProfile;
  import net.minecraft.server.MinecraftServer;
-@@ -13,6 +15,7 @@ import org.bukkit.block.Block;
- import org.bukkit.block.BlockFace;
+@@ -14,6 +16,7 @@ import org.bukkit.block.BlockFace;
  import org.bukkit.block.Skull;
  import org.bukkit.block.data.Rotatable;
+ import org.bukkit.craftbukkit.entity.CraftPlayer;
 +import javax.annotation.Nullable;
  
  public class CraftSkull extends CraftBlockEntityState<TileEntitySkull> implements Skull {
  
-@@ -99,6 +102,20 @@ public class CraftSkull extends CraftBlockEntityState<TileEntitySkull> implement
-         this.profile = new GameProfile(player.getUniqueId(), player.getName());
+@@ -104,6 +107,20 @@ public class CraftSkull extends CraftBlockEntityState<TileEntitySkull> implement
+         }
      }
  
 +    // Paper start
@@ -48,7 +48,7 @@ index f113da713a..fdfe101ae3 100644
      public BlockFace getRotation() {
          return ((Rotatable) getBlockData()).getRotation();
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index 7984c68cb0..14d8dd65ac 100644
+index 2ea2a355ba..398cf958cc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -2,6 +2,8 @@ package org.bukkit.craftbukkit.inventory;
@@ -60,7 +60,7 @@ index 7984c68cb0..14d8dd65ac 100644
  import net.minecraft.server.GameProfileSerializer;
  import net.minecraft.server.NBTBase;
  import net.minecraft.server.NBTTagCompound;
-@@ -19,6 +21,8 @@ import org.bukkit.inventory.meta.SkullMeta;
+@@ -20,6 +22,8 @@ import org.bukkit.inventory.meta.SkullMeta;
  import com.google.common.collect.ImmutableMap.Builder;
  import com.mojang.authlib.GameProfile;
  
@@ -69,7 +69,7 @@ index 7984c68cb0..14d8dd65ac 100644
  @DelegateDeserialization(SerializableMeta.class)
  class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
  
-@@ -130,6 +134,19 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
+@@ -131,6 +135,19 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
          return hasOwner() ? profile.getName() : null;
      }
  
diff --git a/work/CraftBukkit b/work/CraftBukkit
index c88ae6b195..632449b6c4 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit c88ae6b1953fd60b724a2b8e555499b5d0acaa00
+Subproject commit 632449b6c48da3c7c96a430fdb95c1d8b3b873df