diff --git a/Spigot-Server-Patches/Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/Extend-Player-Interact-cancellation.patch
index dc19aff795..17501ef9de 100644
--- a/Spigot-Server-Patches/Extend-Player-Interact-cancellation.patch
+++ b/Spigot-Server-Patches/Extend-Player-Interact-cancellation.patch
@@ -29,7 +29,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                      // Update any tile entity data for this block
                      TileEntity tileentity = this.world.getTileEntity(blockposition);
 @@ -0,0 +0,0 @@ public class PlayerInteractManager {
-         interactResult = event.useItemInHand() == Event.Result.DENY;
+         interactItemStack = itemstack.cloneItemStack();
  
          if (event.useInteractedBlock() == Event.Result.DENY) {
 +
diff --git a/work/Bukkit b/work/Bukkit
index 84fcddbf95..91957aa3b9 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 84fcddbf950c5414164ec4767c77b5a113aeca6e
+Subproject commit 91957aa3b9b05c0a9243d7c360e284f508d925a8
diff --git a/work/CraftBukkit b/work/CraftBukkit
index bf3d720714..6f55306c44 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit bf3d7207140a295c35d4024a43cd188824c5a359
+Subproject commit 6f55306c444c3356c4ae394dd708a97451b06fa2