diff --git a/Spigot-Server-Patches/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
index ff6e1e0ed..2cd65d90c 100644
--- a/Spigot-Server-Patches/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-Server-Patches/ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@@ -186,7 +186,7 @@ index bf061cf06..55f978768 100644
                  // CraftBukkit end
              }
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 32b0e7965..5b8ddc76e 100644
+index a165378ac..50a1239c2 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -0,0 +0,0 @@ public class PlayerInteractManager {
diff --git a/Spigot-Server-Patches/Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/Extend-Player-Interact-cancellation.patch
index c21081118..1e51da49a 100644
--- a/Spigot-Server-Patches/Extend-Player-Interact-cancellation.patch
+++ b/Spigot-Server-Patches/Extend-Player-Interact-cancellation.patch
@@ -13,7 +13,7 @@ Update adjacent blocks of doors, double plants, pistons and beds
 when cancelling interaction.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index aa7780eff..23223e89d 100644
+index 50a1239c2..ef0b03795 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -0,0 +0,0 @@ public class PlayerInteractManager {
diff --git a/Spigot-Server-Patches/MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch b/Spigot-Server-Patches/MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
index 78bdb3955..de7a2dc28 100644
--- a/Spigot-Server-Patches/MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
+++ b/Spigot-Server-Patches/MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
@@ -13,7 +13,7 @@ keep the clone of the item used to a non empty value so it represents
 the item used.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 1d76c4c99..be6cd6adf 100644
+index cf5392311..843644933 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -0,0 +0,0 @@ public class PlayerInteractManager {
diff --git a/work/Bukkit b/work/Bukkit
index 5b680f0b3..6de6ac4a8 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 5b680f0b3229afd88011315696d19fc1c04d32e6
+Subproject commit 6de6ac4a8b5e3015be6105e96ff579508b9a6fc0
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 5932f8a7d..f17d591cc 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 5932f8a7dae0fbf852592579edfa277ab260752a
+Subproject commit f17d591cc9a57323b254d3981c8944e1c05bf37f
diff --git a/work/Spigot b/work/Spigot
index 19c3c5a51..f56e2e787 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 19c3c5a51d345122f722bc1edf2a703dc40cee3c
+Subproject commit f56e2e787f425025af0d7410ff4cdb4f8edf7f3b