diff --git a/patches/server/0967-Fix-Player-setBlockUpdate.patch b/patches/server/0967-Fix-Player-setBlockUpdate.patch
new file mode 100644
index 0000000000..fd8ab6bd92
--- /dev/null
+++ b/patches/server/0967-Fix-Player-setBlockUpdate.patch
@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <jake.m.potrebic@gmail.com>
+Date: Tue, 4 Jun 2024 19:48:03 -0700
+Subject: [PATCH] Fix Player#setBlockUpdate
+
+BlockEntity needs its Level set
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
+index 397eb1a101bd60f49dbb2fa8eddf28f6f233167f..e28bc898786542f695017ff0a036676840eb79fe 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
+@@ -177,6 +177,7 @@ public abstract class CraftBlockEntityState<T extends BlockEntity> extends Craft
+     @Nullable
+     public Packet<ClientGamePacketListener> getUpdatePacket(@NotNull Location location) {
+         T vanillaTileEntitiy = (T) BlockEntity.loadStatic(CraftLocation.toBlockPosition(location), this.getHandle(), this.getSnapshotNBT(), this.getRegistryAccess());
++        vanillaTileEntitiy.setLevel(((org.bukkit.craftbukkit.CraftWorld) location.getWorld()).getHandle()); // Paper - set level. Required for accessing RegistryAccess
+         return ClientboundBlockEntityDataPacket.create(vanillaTileEntitiy);
+     }
+ 
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+index 4a886f11b10395143879e1c1795afc269eed109d..8d697782fae536377ac29acf967c764ee8a7951a 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+@@ -1118,6 +1118,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+     public void sendBlockUpdate(@NotNull Location location, @NotNull TileState tileState) throws IllegalArgumentException {
+         Preconditions.checkArgument(location != null, "Location can not be null");
+         Preconditions.checkArgument(tileState != null, "TileState can not be null");
++        Preconditions.checkArgument(location.getWorld() != null, "Location must have a world"); // Paper
+ 
+         if (this.getHandle().connection == null) return;
+ 
diff --git a/patches/server/0967-Fix-helmet-damage-reduction-inconsistencies.patch b/patches/server/0968-Fix-helmet-damage-reduction-inconsistencies.patch
similarity index 100%
rename from patches/server/0967-Fix-helmet-damage-reduction-inconsistencies.patch
rename to patches/server/0968-Fix-helmet-damage-reduction-inconsistencies.patch
diff --git a/patches/server/0968-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/server/0969-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
similarity index 100%
rename from patches/server/0968-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
rename to patches/server/0969-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
diff --git a/patches/server/0969-improve-checking-handled-tags-in-itemmeta.patch b/patches/server/0970-improve-checking-handled-tags-in-itemmeta.patch
similarity index 100%
rename from patches/server/0969-improve-checking-handled-tags-in-itemmeta.patch
rename to patches/server/0970-improve-checking-handled-tags-in-itemmeta.patch
diff --git a/patches/server/0970-General-ItemMeta-fixes.patch b/patches/server/0971-General-ItemMeta-fixes.patch
similarity index 99%
rename from patches/server/0970-General-ItemMeta-fixes.patch
rename to patches/server/0971-General-ItemMeta-fixes.patch
index 7f64ec27a7..563ec07fd9 100644
--- a/patches/server/0970-General-ItemMeta-fixes.patch
+++ b/patches/server/0971-General-ItemMeta-fixes.patch
@@ -42,7 +42,7 @@ index 6207c6063cd11ccb1177fe7016c49c02a3416990..cd3b952a228c09077c2e74183a34ddb3
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index 397eb1a101bd60f49dbb2fa8eddf28f6f233167f..2c61e8d5bbab59c691f4cb003041e7e50e406b85 100644
+index e28bc898786542f695017ff0a036676840eb79fe..cee3fe00cc662f095e7d726b5f1a913cd8199210 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -135,6 +135,19 @@ public abstract class CraftBlockEntityState<T extends BlockEntity> extends Craft
diff --git a/patches/server/0971-Expose-hasColor-to-leather-armor.patch b/patches/server/0972-Expose-hasColor-to-leather-armor.patch
similarity index 100%
rename from patches/server/0971-Expose-hasColor-to-leather-armor.patch
rename to patches/server/0972-Expose-hasColor-to-leather-armor.patch
diff --git a/patches/server/0972-Added-API-to-get-player-ha-proxy-address.patch b/patches/server/0973-Added-API-to-get-player-ha-proxy-address.patch
similarity index 97%
rename from patches/server/0972-Added-API-to-get-player-ha-proxy-address.patch
rename to patches/server/0973-Added-API-to-get-player-ha-proxy-address.patch
index 5ef4bac68c..6ab913db18 100644
--- a/patches/server/0972-Added-API-to-get-player-ha-proxy-address.patch
+++ b/patches/server/0973-Added-API-to-get-player-ha-proxy-address.patch
@@ -35,7 +35,7 @@ index 96355e1da8feb6687ea0069dda4a82fcd7e25e8a..1f696644b958538e9f5d568a2e4bba69
                                  } else {
                                      super.channelRead(ctx, msg);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4a886f11b10395143879e1c1795afc269eed109d..67a715a812d700df912834874107078255d7c695 100644
+index 8d697782fae536377ac29acf967c764ee8a7951a..e41b7191d0cebeb77b8d07a1b5bddc1b695cb922 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -275,6 +275,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0973-More-Chest-Block-API.patch b/patches/server/0974-More-Chest-Block-API.patch
similarity index 100%
rename from patches/server/0973-More-Chest-Block-API.patch
rename to patches/server/0974-More-Chest-Block-API.patch
diff --git a/patches/server/0974-Print-data-component-type-on-encoding-error.patch b/patches/server/0975-Print-data-component-type-on-encoding-error.patch
similarity index 100%
rename from patches/server/0974-Print-data-component-type-on-encoding-error.patch
rename to patches/server/0975-Print-data-component-type-on-encoding-error.patch
diff --git a/patches/server/0975-Brigadier-based-command-API.patch b/patches/server/0976-Brigadier-based-command-API.patch
similarity index 100%
rename from patches/server/0975-Brigadier-based-command-API.patch
rename to patches/server/0976-Brigadier-based-command-API.patch
diff --git a/patches/server/0976-Fix-issues-with-Recipe-API.patch b/patches/server/0977-Fix-issues-with-Recipe-API.patch
similarity index 100%
rename from patches/server/0976-Fix-issues-with-Recipe-API.patch
rename to patches/server/0977-Fix-issues-with-Recipe-API.patch
diff --git a/patches/server/0977-Fix-equipment-slot-and-group-API.patch b/patches/server/0978-Fix-equipment-slot-and-group-API.patch
similarity index 100%
rename from patches/server/0977-Fix-equipment-slot-and-group-API.patch
rename to patches/server/0978-Fix-equipment-slot-and-group-API.patch
diff --git a/patches/server/0978-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/server/0979-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
similarity index 100%
rename from patches/server/0978-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
rename to patches/server/0979-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
diff --git a/patches/server/0979-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0980-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0979-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0980-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0980-Prevent-NPE-if-hooked-entity-was-cleared.patch b/patches/server/0981-Prevent-NPE-if-hooked-entity-was-cleared.patch
similarity index 100%
rename from patches/server/0980-Prevent-NPE-if-hooked-entity-was-cleared.patch
rename to patches/server/0981-Prevent-NPE-if-hooked-entity-was-cleared.patch
diff --git a/patches/server/0981-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch b/patches/server/0982-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
similarity index 100%
rename from patches/server/0981-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
rename to patches/server/0982-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
diff --git a/patches/server/0982-Add-missing-fishing-event-state.patch b/patches/server/0983-Add-missing-fishing-event-state.patch
similarity index 100%
rename from patches/server/0982-Add-missing-fishing-event-state.patch
rename to patches/server/0983-Add-missing-fishing-event-state.patch
diff --git a/patches/server/0983-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/server/0984-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
similarity index 100%
rename from patches/server/0983-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
rename to patches/server/0984-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
diff --git a/patches/server/0984-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch b/patches/server/0985-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
similarity index 100%
rename from patches/server/0984-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
rename to patches/server/0985-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
diff --git a/patches/server/0985-Adopt-MaterialRerouting.patch b/patches/server/0986-Adopt-MaterialRerouting.patch
similarity index 100%
rename from patches/server/0985-Adopt-MaterialRerouting.patch
rename to patches/server/0986-Adopt-MaterialRerouting.patch
diff --git a/patches/server/0986-Suspicious-Effect-Entry-API.patch b/patches/server/0987-Suspicious-Effect-Entry-API.patch
similarity index 100%
rename from patches/server/0986-Suspicious-Effect-Entry-API.patch
rename to patches/server/0987-Suspicious-Effect-Entry-API.patch
diff --git a/patches/server/0987-check-if-itemstack-is-stackable-first.patch b/patches/server/0988-check-if-itemstack-is-stackable-first.patch
similarity index 100%
rename from patches/server/0987-check-if-itemstack-is-stackable-first.patch
rename to patches/server/0988-check-if-itemstack-is-stackable-first.patch
diff --git a/patches/server/0988-Chunk-System-Starlight-from-Moonrise.patch b/patches/server/0989-Chunk-System-Starlight-from-Moonrise.patch
similarity index 99%
rename from patches/server/0988-Chunk-System-Starlight-from-Moonrise.patch
rename to patches/server/0989-Chunk-System-Starlight-from-Moonrise.patch
index de79cb6927..fcf1f488ff 100644
--- a/patches/server/0988-Chunk-System-Starlight-from-Moonrise.patch
+++ b/patches/server/0989-Chunk-System-Starlight-from-Moonrise.patch
@@ -28628,10 +28628,10 @@ index 8f88ccec6b8947ca2738dc07c23aebe258145c83..cdc704364cf339084537d089e654f607
  
      // Paper start - implement pointers
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 67a715a812d700df912834874107078255d7c695..545921a7e07dccc749711208f160fdbfab53c5fa 100644
+index e41b7191d0cebeb77b8d07a1b5bddc1b695cb922..ecd975855d92ae5948ee926f42396cb004843aed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3490,12 +3490,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3491,12 +3491,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public int getViewDistance() {
@@ -28648,7 +28648,7 @@ index 67a715a812d700df912834874107078255d7c695..545921a7e07dccc749711208f160fdbf
      }
  
      @Override
-@@ -3505,7 +3507,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3506,7 +3508,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setSimulationDistance(final int simulationDistance) {
@@ -28659,7 +28659,7 @@ index 67a715a812d700df912834874107078255d7c695..545921a7e07dccc749711208f160fdbf
      }
  
      @Override
-@@ -3515,6 +3519,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3516,6 +3520,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setSendViewDistance(final int viewDistance) {
diff --git a/patches/server/0989-Rewrite-dataconverter-system.patch b/patches/server/0990-Rewrite-dataconverter-system.patch
similarity index 100%
rename from patches/server/0989-Rewrite-dataconverter-system.patch
rename to patches/server/0990-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0990-disable-forced-empty-world-ticks.patch b/patches/server/0991-disable-forced-empty-world-ticks.patch
similarity index 100%
rename from patches/server/0990-disable-forced-empty-world-ticks.patch
rename to patches/server/0991-disable-forced-empty-world-ticks.patch
diff --git a/patches/server/0991-stubs.patch b/patches/server/0992-stubs.patch
similarity index 91%
rename from patches/server/0991-stubs.patch
rename to patches/server/0992-stubs.patch
index 289a1338b8..7bc16f1c5f 100644
--- a/patches/server/0991-stubs.patch
+++ b/patches/server/0992-stubs.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] stubs
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 545921a7e07dccc749711208f160fdbfab53c5fa..ff2d05126d3857fa501f0b9df80e373b1811f7cf 100644
+index ecd975855d92ae5948ee926f42396cb004843aed..4a613d94f40cc73a9f50b8ef2d6949fc2bd34e53 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -110,6 +110,7 @@ import net.minecraft.world.level.saveddata.maps.MapItemSavedData;
@@ -24,7 +24,7 @@ index 545921a7e07dccc749711208f160fdbfab53c5fa..ff2d05126d3857fa501f0b9df80e373b
  
  @DelegateDeserialization(CraftOfflinePlayer.class)
  public class CraftPlayer extends CraftHumanEntity implements Player {
-@@ -3480,6 +3482,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3481,6 +3483,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleDuration() {
          this.getHandle().resetLastActionTime();
      }
diff --git a/patches/server/0992-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0993-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
similarity index 100%
rename from patches/server/0992-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
rename to patches/server/0993-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/0993-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0994-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 100%
rename from patches/server/0993-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to patches/server/0994-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/0994-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0995-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
similarity index 100%
rename from patches/server/0994-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
rename to patches/server/0995-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
diff --git a/patches/server/0995-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0996-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from patches/server/0995-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to patches/server/0996-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0996-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0997-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from patches/server/0996-Allow-Saving-of-Oversized-Chunks.patch
rename to patches/server/0997-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0997-Flat-bedrock-generator-settings.patch b/patches/server/0998-Flat-bedrock-generator-settings.patch
similarity index 100%
rename from patches/server/0997-Flat-bedrock-generator-settings.patch
rename to patches/server/0998-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0998-Entity-Activation-Range-2.0.patch b/patches/server/0999-Entity-Activation-Range-2.0.patch
similarity index 100%
rename from patches/server/0998-Entity-Activation-Range-2.0.patch
rename to patches/server/0999-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/0999-Optional-per-player-mob-spawns.patch b/patches/server/1000-Optional-per-player-mob-spawns.patch
similarity index 100%
rename from patches/server/0999-Optional-per-player-mob-spawns.patch
rename to patches/server/1000-Optional-per-player-mob-spawns.patch
diff --git a/patches/server/1000-Anti-Xray.patch b/patches/server/1001-Anti-Xray.patch
similarity index 100%
rename from patches/server/1000-Anti-Xray.patch
rename to patches/server/1001-Anti-Xray.patch