diff --git a/Spigot-Server-Patches/API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/API-to-get-a-BlockState-without-a-snapshot.patch
index 64f87ae33d..25a82c3c3c 100644
--- a/Spigot-Server-Patches/API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-Server-Patches/API-to-get-a-BlockState-without-a-snapshot.patch
@@ -86,7 +86,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -0,0 +0,0 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
          this.tileEntity = tileEntityClass.cast(world.getHandle().getTileEntity(this.getPosition()));
-         Preconditions.checkState(this.tileEntity != null, "Tile is null, asynchronous access? " + block);
+         Preconditions.checkState(this.tileEntity != null, "Tile is null, asynchronous access? %s", block);
  
 +        // Paper start
 +        this.snapshotDisabled = DISABLE_SNAPSHOT;
diff --git a/work/CraftBukkit b/work/CraftBukkit
index c631fe5579..e5cb519d6a 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit c631fe557977348f9e8a82bfc168d61584cdc1b0
+Subproject commit e5cb519d6a4a65eae882df759233890bc518cc0f