diff --git a/Spigot-Server-Patches/AnvilDamageEvent.patch b/Spigot-Server-Patches/AnvilDamageEvent.patch
index 4df3306a84..642ffb87a3 100644
--- a/Spigot-Server-Patches/AnvilDamageEvent.patch
+++ b/Spigot-Server-Patches/AnvilDamageEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] AnvilDamageEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
-index f2e15fa545..96fcd35bfe 100644
+index 4b6424911..5d239322d 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
 @@ -0,0 +0,0 @@ public class ContainerAnvil extends Container {
diff --git a/Spigot-Server-Patches/Fix-Anvil-Level-sync-to-client.patch b/Spigot-Server-Patches/Fix-Anvil-Level-sync-to-client.patch
index ae9dd5b43a..b8358d1405 100644
--- a/Spigot-Server-Patches/Fix-Anvil-Level-sync-to-client.patch
+++ b/Spigot-Server-Patches/Fix-Anvil-Level-sync-to-client.patch
@@ -10,7 +10,7 @@ Was done incorrectly and is now causing level desyncs to client.
 Always send current level to the client, and instead make setWindowProperty set the level.
 
 diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
-index a8a875fe11..f2e15fa545 100644
+index 8731d857b..4b6424911 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
 @@ -0,0 +0,0 @@ public class ContainerAnvil extends Container {
@@ -26,7 +26,7 @@ index a8a875fe11..f2e15fa545 100644
  
          this.lastLevelCost = this.levelCost;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1ddbb4329d..a045ec3b22 100644
+index 1ddbb4329..a045ec3b2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/work/Bukkit b/work/Bukkit
index 66b9b8fdd8..ee12ca7b71 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 66b9b8fdd86fe1ef2c7c02ca2316a4025cbfb099
+Subproject commit ee12ca7b712793de5356eec6a9162073faae88f8
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 6a0c4e1cc2..1ceee63341 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 6a0c4e1cc2518ad246ad51dc9c06412f3c46371f
+Subproject commit 1ceee63341927e71e23293be6cb7466bd3045e9e