diff --git a/Spigot-Server-Patches/Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/Extend-Player-Interact-cancellation.patch
index f03d3d395e..d7d0d71cdd 100644
--- a/Spigot-Server-Patches/Extend-Player-Interact-cancellation.patch
+++ b/Spigot-Server-Patches/Extend-Player-Interact-cancellation.patch
@@ -52,9 +52,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              // If we denied a door from opening, we need to send a correcting update to the client, as it already opened the door.
              if (iblockdata.getBlock() instanceof BlockDoor) {
                  boolean bottom = iblockdata.get(BlockDoor.HALF) == BlockPropertyDoubleBlockHalf.LOWER;
-                 entityplayer.playerConnection.sendPacket(new PacketPlayOutBlockChange(world, bottom ? blockposition.up() : blockposition.down()));
-             } else if (iblockdata.getBlock() instanceof BlockCake) {
-                 entityplayer.getBukkitEntity().sendHealthUpdate(); // SPIGOT-1341 - reset health for cake
+@@ -0,0 +0,0 @@ public class PlayerInteractManager {
+ 
+                 // send a correcting update to the client for the block above as well, this because of replaceable blocks (such as grass, sea grass etc)
+                 entityplayer.playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition.up()));
 +            // Paper start  - extend Player Interact cancellation // TODO: consider merging this into the extracted method
 +            } else if (iblockdata.getBlock() instanceof BlockStructure) {
 +                entityplayer.playerConnection.sendPacket(new PacketPlayOutCloseWindow());
diff --git a/work/Bukkit b/work/Bukkit
index 6bff9d0996..80ece5de93 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 6bff9d0996132e9e38679b13853fc0b16a55e33c
+Subproject commit 80ece5de932aee4d2c37d13189722b26d45aec5b
diff --git a/work/CraftBukkit b/work/CraftBukkit
index a8d7c94a5b..0d86921e12 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit a8d7c94a5b698732029f2f153904cbe943e70e71
+Subproject commit 0d86921e1231b8476ac5eb61e63da1411df658f7