diff --git a/Spigot-API-Patches/0181-Add-BlockSoundGroup-interface.patch b/Spigot-API-Patches/0181-Add-BlockSoundGroup-interface.patch
index 5405eb792c..428810f1d8 100644
--- a/Spigot-API-Patches/0181-Add-BlockSoundGroup-interface.patch
+++ b/Spigot-API-Patches/0181-Add-BlockSoundGroup-interface.patch
@@ -64,7 +64,7 @@ index 0000000000000000000000000000000000000000..8cf87d228a7006658d52ce0da16c2d74
 +    Sound getFallSound();
 +}
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index d6f74dbcfeb153d4b17be2827e2989f2d8160d21..d4ba9c2b858204825d47fd6e91dab8c003df085a 100644
+index b090938f883c486e703cb7c036c47925f3016704..5e2aa4fb8cf8130df21d3172dd94e857317f7653 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
 @@ -1,6 +1,7 @@
@@ -75,7 +75,7 @@ index d6f74dbcfeb153d4b17be2827e2989f2d8160d21..d4ba9c2b858204825d47fd6e91dab8c0
  import org.bukkit.Chunk;
  import org.bukkit.FluidCollisionMode;
  import org.bukkit.Location;
-@@ -549,4 +550,16 @@ public interface Block extends Metadatable {
+@@ -560,4 +561,16 @@ public interface Block extends Metadatable {
       */
      @NotNull
      BoundingBox getBoundingBox();
diff --git a/Spigot-API-Patches/0223-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/Spigot-API-Patches/0223-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
index 5e0b5360cc..94bdee7d83 100644
--- a/Spigot-API-Patches/0223-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
+++ b/Spigot-API-Patches/0223-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
@@ -59,10 +59,10 @@ index b824a1b0590014d428e64f789008454bd241996a..23d0798d479fc3dd9cc4c41f7999a889
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index f8c599718143fe638de422fd4625f353ee6c54ae..7616c5601adee3cbe0e5f722646a2458b535ab77 100644
+index e1cc36fbe808973227c0e8ca7166453235c90279..e6647c45f65bae916759cd899256f8130790d242 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
-@@ -573,5 +573,13 @@ public interface Block extends Metadatable {
+@@ -584,5 +584,13 @@ public interface Block extends Metadatable {
       */
      @NotNull
      com.destroystokyo.paper.block.BlockSoundGroup getSoundGroup();
diff --git a/Spigot-API-Patches/0236-Add-Destroy-Speed-API.patch b/Spigot-API-Patches/0236-Add-Destroy-Speed-API.patch
index 6ff1aff950..bdf3dd2bbe 100644
--- a/Spigot-API-Patches/0236-Add-Destroy-Speed-API.patch
+++ b/Spigot-API-Patches/0236-Add-Destroy-Speed-API.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add Destroy Speed API
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 7616c5601adee3cbe0e5f722646a2458b535ab77..7f1b6e0a397f97fce22e209cd3eefe1d8ffd1174 100644
+index e6647c45f65bae916759cd899256f8130790d242..e4e3be0ee9c557e04d9ed1ab6f1569bd36a0e846 100644
 --- a/src/main/java/org/bukkit/block/Block.java
 +++ b/src/main/java/org/bukkit/block/Block.java
-@@ -581,5 +581,29 @@ public interface Block extends Metadatable {
+@@ -592,5 +592,29 @@ public interface Block extends Metadatable {
       */
      @NotNull
      String getTranslationKey();
diff --git a/Spigot-Server-Patches/0356-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0356-Implement-CraftBlockSoundGroup.patch
index 8035729b0d..722e63e63a 100644
--- a/Spigot-Server-Patches/0356-Implement-CraftBlockSoundGroup.patch
+++ b/Spigot-Server-Patches/0356-Implement-CraftBlockSoundGroup.patch
@@ -66,10 +66,10 @@ index 0987b25ac586d5d7b7954256c740fdf736498dae..b2a52c6bad5a83f34188b8f3db18c61f
  
      public SoundEffectType(float f, float f1, SoundEffect soundeffect, SoundEffect soundeffect1, SoundEffect soundeffect2, SoundEffect soundeffect3, SoundEffect soundeffect4) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 783e470097239f65d0375295fb68438f2fa75b73..aab855c64507e4a695c1be8693522b91b24b9cdd 100644
+index 8a6d8f21937ce7e2ac4623a3083421ed5ef9aa63..724b230259b1b44bc9fdde6c4fcbcdde5f690e05 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -739,4 +739,11 @@ public class CraftBlock implements Block {
+@@ -750,4 +750,11 @@ public class CraftBlock implements Block {
          AxisAlignedBB aabb = shape.getBoundingBox();
          return new BoundingBox(getX() + aabb.minX, getY() + aabb.minY, getZ() + aabb.minZ, getX() + aabb.maxX, getY() + aabb.maxY, getZ() + aabb.maxZ);
      }
diff --git a/Spigot-Server-Patches/0565-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/Spigot-Server-Patches/0565-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
index 2bebef7794..7c4d34911d 100644
--- a/Spigot-Server-Patches/0565-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
+++ b/Spigot-Server-Patches/0565-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
@@ -59,10 +59,10 @@ index cc512bd2e89382e7fdbc59b41640e95ccafbbfe9..768934fa4158a9773d06f5b23bfb19db
          if (this.name == null) {
              this.name = SystemUtils.a("block", IRegistry.BLOCK.getKey(this));
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 650b80b6e38dffa6b6b211cf4ea1125105748935..29756fee1b1c343dbda5a4654b13f5433522cb54 100644
+index e3ab0b76e5003553b29215a43bc5a762f2663648..ee8977a1e4a83598ba7873c4c482fea828c6b26c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -753,5 +753,10 @@ public class CraftBlock implements Block {
+@@ -764,5 +764,10 @@ public class CraftBlock implements Block {
      public com.destroystokyo.paper.block.BlockSoundGroup getSoundGroup() {
          return new com.destroystokyo.paper.block.CraftBlockSoundGroup(getNMSBlock().getBlockData().getStepSound());
      }
diff --git a/Spigot-Server-Patches/0602-Add-Destroy-Speed-API.patch b/Spigot-Server-Patches/0602-Add-Destroy-Speed-API.patch
index 417f8c92bf..bdeb073a85 100644
--- a/Spigot-Server-Patches/0602-Add-Destroy-Speed-API.patch
+++ b/Spigot-Server-Patches/0602-Add-Destroy-Speed-API.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add Destroy Speed API
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 2a3135c018f0b47a32c5a87698ff12fe521081f0..f0f56b757ca77f7ae445761299c1a4f616c67d55 100644
+index f1f03bd0162a158761f300cbd96aa32101542abb..fab9e1e5d63c22faceae093dc88769d203d359c6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -758,5 +758,23 @@ public class CraftBlock implements Block {
+@@ -769,5 +769,23 @@ public class CraftBlock implements Block {
      public String getTranslationKey() {
          return org.bukkit.Bukkit.getUnsafe().getTranslationKey(this);
      }
diff --git a/Spigot-Server-Patches/0689-Add-Block-isValidTool.patch b/Spigot-Server-Patches/0689-Add-Block-isValidTool.patch
index 94f3b70fd9..6cfa745ab3 100644
--- a/Spigot-Server-Patches/0689-Add-Block-isValidTool.patch
+++ b/Spigot-Server-Patches/0689-Add-Block-isValidTool.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Block#isValidTool
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 13b0a5d44860a997fdad7fdf0e68ce72d1b375af..eeeaadbd3aa290fc916f0d465f10cad0687b900d 100644
+index ed1c92d9f2770f7d0503c6facebc51ddcbdf75cf..0006b3cad5fe46e50b0efeae99102f9d80276d61 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -795,5 +795,9 @@ public class CraftBlock implements Block {
+@@ -806,5 +806,9 @@ public class CraftBlock implements Block {
          }
          return speed;
      }
diff --git a/work/Bukkit b/work/Bukkit
index 8dcc25417d..2b8fb83fd8 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 8dcc25417dbfe5f9297f6ad846d5feb6a54b4de4
+Subproject commit 2b8fb83fd8d30c049b9e4fb44407e7eab3a053fe
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 1e1a5b75b7..9db9aeecee 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 1e1a5b75b75e3c3d3590866b2605e6d1f0e07d10
+Subproject commit 9db9aeecee798cd7328856d45b979470504d8cc0