diff --git a/leaf-server/minecraft-patches/features/0282-Skip-PreCreatureSpawnEvent-if-no-listeners.patch b/leaf-server/minecraft-patches/features/0281-Skip-PreCreatureSpawnEvent-if-no-listeners.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0282-Skip-PreCreatureSpawnEvent-if-no-listeners.patch
rename to leaf-server/minecraft-patches/features/0281-Skip-PreCreatureSpawnEvent-if-no-listeners.patch
diff --git a/leaf-server/minecraft-patches/features/0301-optimize-goal-selector.patch b/leaf-server/minecraft-patches/features/0282-optimize-goal-selector.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0301-optimize-goal-selector.patch
rename to leaf-server/minecraft-patches/features/0282-optimize-goal-selector.patch
diff --git a/leaf-server/minecraft-patches/features/0281-thread-unsafe-chunk-map.patch b/leaf-server/minecraft-patches/features/0283-thread-unsafe-chunk-map.patch
similarity index 99%
rename from leaf-server/minecraft-patches/features/0281-thread-unsafe-chunk-map.patch
rename to leaf-server/minecraft-patches/features/0283-thread-unsafe-chunk-map.patch
index 19c7ff3e..1920758a 100644
--- a/leaf-server/minecraft-patches/features/0281-thread-unsafe-chunk-map.patch
+++ b/leaf-server/minecraft-patches/features/0283-thread-unsafe-chunk-map.patch
@@ -81,7 +81,7 @@ index 36ce2be30478d734d8326eeeb004ba7dc61e0642..df60c94a8755df2c2ca71a2702229158
  
      // note: never call while inside the chunk system, this will absolutely break everything
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index f31a643b9fcfdafb2c1c6069b44b736527960787..7f231d95db5d33fccd923cc53466e67de75babc0 100644
+index 5d9dd6feb9a33351de6b9b3d7bceb3e904585e4d..922ef2f5f10ea18d82143a0a52548109359540bf 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -1769,6 +1769,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/leaf-server/minecraft-patches/features/0283-optimize-SimpleBitStorage-object-layout.patch b/leaf-server/minecraft-patches/features/0284-optimize-SimpleBitStorage-object-layout.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0283-optimize-SimpleBitStorage-object-layout.patch
rename to leaf-server/minecraft-patches/features/0284-optimize-SimpleBitStorage-object-layout.patch
diff --git a/leaf-server/minecraft-patches/features/0284-optimize-get-chunk.patch b/leaf-server/minecraft-patches/features/0285-optimize-get-chunk.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0284-optimize-get-chunk.patch
rename to leaf-server/minecraft-patches/features/0285-optimize-get-chunk.patch
diff --git a/leaf-server/minecraft-patches/features/0285-remove-shouldTickBlocksAt-check.patch b/leaf-server/minecraft-patches/features/0286-remove-shouldTickBlocksAt-check.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0285-remove-shouldTickBlocksAt-check.patch
rename to leaf-server/minecraft-patches/features/0286-remove-shouldTickBlocksAt-check.patch
diff --git a/leaf-server/minecraft-patches/features/0286-optimize-PalettedContainer-get.patch b/leaf-server/minecraft-patches/features/0287-optimize-PalettedContainer-get.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0286-optimize-PalettedContainer-get.patch
rename to leaf-server/minecraft-patches/features/0287-optimize-PalettedContainer-get.patch
diff --git a/leaf-server/minecraft-patches/features/0287-optimize-LevelChunk-getBlockStateFinal.patch b/leaf-server/minecraft-patches/features/0288-optimize-LevelChunk-getBlockStateFinal.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0287-optimize-LevelChunk-getBlockStateFinal.patch
rename to leaf-server/minecraft-patches/features/0288-optimize-LevelChunk-getBlockStateFinal.patch
diff --git a/leaf-server/minecraft-patches/features/0288-optimize-FluidState-is-TagKey.patch b/leaf-server/minecraft-patches/features/0289-optimize-FluidState-is-TagKey.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0288-optimize-FluidState-is-TagKey.patch
rename to leaf-server/minecraft-patches/features/0289-optimize-FluidState-is-TagKey.patch
diff --git a/leaf-server/minecraft-patches/features/0289-optimize-fluid.patch b/leaf-server/minecraft-patches/features/0290-optimize-fluid.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0289-optimize-fluid.patch
rename to leaf-server/minecraft-patches/features/0290-optimize-fluid.patch
diff --git a/leaf-server/minecraft-patches/features/0290-optimize-SpreadingSnowyDirtBlock-randomTick.patch b/leaf-server/minecraft-patches/features/0291-optimize-SpreadingSnowyDirtBlock-randomTick.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0290-optimize-SpreadingSnowyDirtBlock-randomTick.patch
rename to leaf-server/minecraft-patches/features/0291-optimize-SpreadingSnowyDirtBlock-randomTick.patch
diff --git a/leaf-server/minecraft-patches/features/0291-optimize-onClimbable.patch b/leaf-server/minecraft-patches/features/0292-optimize-onClimbable.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0291-optimize-onClimbable.patch
rename to leaf-server/minecraft-patches/features/0292-optimize-onClimbable.patch
diff --git a/leaf-server/minecraft-patches/features/0292-optimize-applyMovementEmissionAndPlaySound.patch b/leaf-server/minecraft-patches/features/0293-optimize-applyMovementEmissionAndPlaySound.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0292-optimize-applyMovementEmissionAndPlaySound.patch
rename to leaf-server/minecraft-patches/features/0293-optimize-applyMovementEmissionAndPlaySound.patch
diff --git a/leaf-server/minecraft-patches/features/0293-optimize-isStateClimbable.patch b/leaf-server/minecraft-patches/features/0294-optimize-isStateClimbable.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0293-optimize-isStateClimbable.patch
rename to leaf-server/minecraft-patches/features/0294-optimize-isStateClimbable.patch
diff --git a/leaf-server/minecraft-patches/features/0294-optimize-getOnPos.patch b/leaf-server/minecraft-patches/features/0295-optimize-getOnPos.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0294-optimize-getOnPos.patch
rename to leaf-server/minecraft-patches/features/0295-optimize-getOnPos.patch
diff --git a/leaf-server/minecraft-patches/features/0295-optimize-get-eye-block-position.patch b/leaf-server/minecraft-patches/features/0296-optimize-get-eye-block-position.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0295-optimize-get-eye-block-position.patch
rename to leaf-server/minecraft-patches/features/0296-optimize-get-eye-block-position.patch
diff --git a/leaf-server/minecraft-patches/features/0296-optimize-updateFluidHeightAndDoFluidPushing.patch b/leaf-server/minecraft-patches/features/0297-optimize-updateFluidHeightAndDoFluidPushing.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0296-optimize-updateFluidHeightAndDoFluidPushing.patch
rename to leaf-server/minecraft-patches/features/0297-optimize-updateFluidHeightAndDoFluidPushing.patch
diff --git a/leaf-server/minecraft-patches/features/0297-optimize-checkInsideBlocks.patch b/leaf-server/minecraft-patches/features/0298-optimize-checkInsideBlocks.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0297-optimize-checkInsideBlocks.patch
rename to leaf-server/minecraft-patches/features/0298-optimize-checkInsideBlocks.patch
diff --git a/leaf-server/minecraft-patches/features/0298-Replace-fluid-height-map.patch b/leaf-server/minecraft-patches/features/0299-Replace-fluid-height-map.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0298-Replace-fluid-height-map.patch
rename to leaf-server/minecraft-patches/features/0299-Replace-fluid-height-map.patch
diff --git a/leaf-server/minecraft-patches/features/0299-optimize-collision-shape.patch b/leaf-server/minecraft-patches/features/0300-optimize-collision-shape.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0299-optimize-collision-shape.patch
rename to leaf-server/minecraft-patches/features/0300-optimize-collision-shape.patch
diff --git a/leaf-server/minecraft-patches/features/0300-cache-collision-list.patch b/leaf-server/minecraft-patches/features/0301-cache-collision-list.patch
similarity index 98%
rename from leaf-server/minecraft-patches/features/0300-cache-collision-list.patch
rename to leaf-server/minecraft-patches/features/0301-cache-collision-list.patch
index 8bba5402..36825f4a 100644
--- a/leaf-server/minecraft-patches/features/0300-cache-collision-list.patch
+++ b/leaf-server/minecraft-patches/features/0301-cache-collision-list.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] cache collision list
 
 
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index ba9efafd8e58e1dee7d871892906f85b4cbdf89a..4599332ae1fd488c29e1f9332f557d3ee417ce47 100644
+index b94f2122da885fe94bd60c7914421968e6a2f3fa..57e123c65f48690a5d6375e4dfd1465c531d4480 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -1095,6 +1095,8 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe