diff --git a/leaf-server/minecraft-patches/features/0124-ShreddedPaper-Don-t-block-main-thread-in-Connection-.patch b/leaf-archived-patches/work/server/0124-ShreddedPaper-Don-t-block-main-thread-in-Connection-.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0124-ShreddedPaper-Don-t-block-main-thread-in-Connection-.patch
rename to leaf-archived-patches/work/server/0124-ShreddedPaper-Don-t-block-main-thread-in-Connection-.patch
diff --git a/leaf-server/minecraft-patches/features/0125-Use-ensureCapacity-to-pre-populate-the-size-of-ticki.patch b/leaf-server/minecraft-patches/features/0124-Use-ensureCapacity-to-pre-populate-the-size-of-ticki.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0125-Use-ensureCapacity-to-pre-populate-the-size-of-ticki.patch
rename to leaf-server/minecraft-patches/features/0124-Use-ensureCapacity-to-pre-populate-the-size-of-ticki.patch
diff --git a/leaf-server/minecraft-patches/features/0126-Directly-use-the-pre-filtered-ticking-chunks-list-as.patch b/leaf-server/minecraft-patches/features/0125-Directly-use-the-pre-filtered-ticking-chunks-list-as.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0126-Directly-use-the-pre-filtered-ticking-chunks-list-as.patch
rename to leaf-server/minecraft-patches/features/0125-Directly-use-the-pre-filtered-ticking-chunks-list-as.patch
diff --git a/leaf-server/minecraft-patches/features/0127-Bulk-writes-to-writeLongArray-during-chunk-loading.patch b/leaf-server/minecraft-patches/features/0126-Bulk-writes-to-writeLongArray-during-chunk-loading.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0127-Bulk-writes-to-writeLongArray-during-chunk-loading.patch
rename to leaf-server/minecraft-patches/features/0126-Bulk-writes-to-writeLongArray-during-chunk-loading.patch
diff --git a/leaf-server/minecraft-patches/features/0128-Optimize-AABB.patch b/leaf-server/minecraft-patches/features/0127-Optimize-AABB.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0128-Optimize-AABB.patch
rename to leaf-server/minecraft-patches/features/0127-Optimize-AABB.patch
diff --git a/leaf-server/minecraft-patches/features/0129-Improve-sorting-in-SortedArraySet.patch b/leaf-server/minecraft-patches/features/0128-Improve-sorting-in-SortedArraySet.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0129-Improve-sorting-in-SortedArraySet.patch
rename to leaf-server/minecraft-patches/features/0128-Improve-sorting-in-SortedArraySet.patch
diff --git a/leaf-server/minecraft-patches/features/0130-Make-removeIf-slightly-faster.patch b/leaf-server/minecraft-patches/features/0129-Make-removeIf-slightly-faster.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0130-Make-removeIf-slightly-faster.patch
rename to leaf-server/minecraft-patches/features/0129-Make-removeIf-slightly-faster.patch
diff --git a/leaf-server/minecraft-patches/features/0131-Optimize-LinearPalette.patch b/leaf-server/minecraft-patches/features/0130-Optimize-LinearPalette.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0131-Optimize-LinearPalette.patch
rename to leaf-server/minecraft-patches/features/0130-Optimize-LinearPalette.patch
diff --git a/leaf-server/minecraft-patches/features/0132-Slightly-optimized-VarInt-write.patch b/leaf-server/minecraft-patches/features/0131-Slightly-optimized-VarInt-write.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0132-Slightly-optimized-VarInt-write.patch
rename to leaf-server/minecraft-patches/features/0131-Slightly-optimized-VarInt-write.patch
diff --git a/leaf-server/minecraft-patches/features/0133-Rewrite-ClientboundLightUpdatePacketData.patch b/leaf-server/minecraft-patches/features/0132-Rewrite-ClientboundLightUpdatePacketData.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0133-Rewrite-ClientboundLightUpdatePacketData.patch
rename to leaf-server/minecraft-patches/features/0132-Rewrite-ClientboundLightUpdatePacketData.patch
diff --git a/leaf-server/minecraft-patches/features/0134-Some-Optimizations-on-SerializableChunkData.patch b/leaf-server/minecraft-patches/features/0133-Some-Optimizations-on-SerializableChunkData.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0134-Some-Optimizations-on-SerializableChunkData.patch
rename to leaf-server/minecraft-patches/features/0133-Some-Optimizations-on-SerializableChunkData.patch
diff --git a/leaf-server/minecraft-patches/features/0135-Rework-ChunkHolderManager.patch b/leaf-server/minecraft-patches/features/0134-Rework-ChunkHolderManager.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0135-Rework-ChunkHolderManager.patch
rename to leaf-server/minecraft-patches/features/0134-Rework-ChunkHolderManager.patch
diff --git a/leaf-server/minecraft-patches/features/0136-Optimize-chunkUnload.patch b/leaf-server/minecraft-patches/features/0135-Optimize-chunkUnload.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0136-Optimize-chunkUnload.patch
rename to leaf-server/minecraft-patches/features/0135-Optimize-chunkUnload.patch
diff --git a/leaf-server/minecraft-patches/features/0137-Async-chunk-sending.patch b/leaf-server/minecraft-patches/features/0136-Async-chunk-sending.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0137-Async-chunk-sending.patch
rename to leaf-server/minecraft-patches/features/0136-Async-chunk-sending.patch
diff --git a/leaf-server/minecraft-patches/features/0138-Spawner-Configurations.patch b/leaf-server/minecraft-patches/features/0137-Spawner-Configurations.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0138-Spawner-Configurations.patch
rename to leaf-server/minecraft-patches/features/0137-Spawner-Configurations.patch
diff --git a/leaf-server/minecraft-patches/features/0139-SparklyPaper-Parallel-world-ticking.patch b/leaf-server/minecraft-patches/features/0138-SparklyPaper-Parallel-world-ticking.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0139-SparklyPaper-Parallel-world-ticking.patch
rename to leaf-server/minecraft-patches/features/0138-SparklyPaper-Parallel-world-ticking.patch
diff --git a/leaf-server/minecraft-patches/features/0140-SparklyPaper-Track-each-world-MSPT.patch b/leaf-server/minecraft-patches/features/0139-SparklyPaper-Track-each-world-MSPT.patch
similarity index 98%
rename from leaf-server/minecraft-patches/features/0140-SparklyPaper-Track-each-world-MSPT.patch
rename to leaf-server/minecraft-patches/features/0139-SparklyPaper-Track-each-world-MSPT.patch
index 2fb7a7cb..aef67f40 100644
--- a/leaf-server/minecraft-patches/features/0140-SparklyPaper-Track-each-world-MSPT.patch
+++ b/leaf-server/minecraft-patches/features/0139-SparklyPaper-Track-each-world-MSPT.patch
@@ -27,7 +27,7 @@ index ac751d460ae0c8dbb858c4047c459a11b57ae175..24926aa7ed5c78b235659daf18b224b1
              CrashReport crashReport = CrashReport.forThrowable(levelTickingException, "Exception ticking world");
              serverLevel.fillReportDetails(crashReport);
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 4ecb9a4125233f91379fd2792112aca6bbb3e33f..b5a61261083ddab70582c1a1d5cac0b9ced9b652 100644
+index 31abf2da10bc9b4b7825ed4b3d4e9da52feb2e39..9ba1c29b75ba0eb545097eef4fe568c53ebd885c 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -573,6 +573,12 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
diff --git a/leaf-server/minecraft-patches/features/0141-PaperPR-Fix-cancelled-Projectile-Events-still-consum.patch b/leaf-server/minecraft-patches/features/0140-PaperPR-Fix-cancelled-Projectile-Events-still-consum.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0141-PaperPR-Fix-cancelled-Projectile-Events-still-consum.patch
rename to leaf-server/minecraft-patches/features/0140-PaperPR-Fix-cancelled-Projectile-Events-still-consum.patch
diff --git a/leaf-server/minecraft-patches/features/0142-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch b/leaf-server/minecraft-patches/features/0141-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0142-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch
rename to leaf-server/minecraft-patches/features/0141-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch
diff --git a/leaf-server/minecraft-patches/features/0143-Remove-streams-on-InsideBrownianWalk.patch b/leaf-server/minecraft-patches/features/0142-Remove-streams-on-InsideBrownianWalk.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0143-Remove-streams-on-InsideBrownianWalk.patch
rename to leaf-server/minecraft-patches/features/0142-Remove-streams-on-InsideBrownianWalk.patch
diff --git a/leaf-server/minecraft-patches/features/0144-Use-BFS-on-getSlopeDistance.patch b/leaf-server/minecraft-patches/features/0143-Use-BFS-on-getSlopeDistance.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0144-Use-BFS-on-getSlopeDistance.patch
rename to leaf-server/minecraft-patches/features/0143-Use-BFS-on-getSlopeDistance.patch
diff --git a/leaf-server/minecraft-patches/features/0145-Paper-PR-Throttle-failed-spawn-attempts.patch b/leaf-server/minecraft-patches/features/0144-Paper-PR-Throttle-failed-spawn-attempts.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0145-Paper-PR-Throttle-failed-spawn-attempts.patch
rename to leaf-server/minecraft-patches/features/0144-Paper-PR-Throttle-failed-spawn-attempts.patch
diff --git a/leaf-server/minecraft-patches/features/0146-Improve-BlockEntity-ticking-isRemoved-check.patch b/leaf-server/minecraft-patches/features/0145-Improve-BlockEntity-ticking-isRemoved-check.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0146-Improve-BlockEntity-ticking-isRemoved-check.patch
rename to leaf-server/minecraft-patches/features/0145-Improve-BlockEntity-ticking-isRemoved-check.patch
diff --git a/leaf-server/minecraft-patches/features/0147-Raytrace-AntiXray-SDK-integration.patch b/leaf-server/minecraft-patches/features/0146-Raytrace-AntiXray-SDK-integration.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0147-Raytrace-AntiXray-SDK-integration.patch
rename to leaf-server/minecraft-patches/features/0146-Raytrace-AntiXray-SDK-integration.patch
diff --git a/leaf-server/minecraft-patches/features/0148-Optimize-addOrUpdateTransientModifier.patch b/leaf-server/minecraft-patches/features/0147-Optimize-addOrUpdateTransientModifier.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0148-Optimize-addOrUpdateTransientModifier.patch
rename to leaf-server/minecraft-patches/features/0147-Optimize-addOrUpdateTransientModifier.patch
diff --git a/leaf-server/minecraft-patches/features/0149-Optimize-ContextMap.create.patch b/leaf-server/minecraft-patches/features/0148-Optimize-ContextMap.create.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0149-Optimize-ContextMap.create.patch
rename to leaf-server/minecraft-patches/features/0148-Optimize-ContextMap.create.patch
diff --git a/leaf-server/minecraft-patches/features/0150-Micro-optimizations-for-random-tick.patch b/leaf-server/minecraft-patches/features/0149-Micro-optimizations-for-random-tick.patch
similarity index 97%
rename from leaf-server/minecraft-patches/features/0150-Micro-optimizations-for-random-tick.patch
rename to leaf-server/minecraft-patches/features/0149-Micro-optimizations-for-random-tick.patch
index 3c67a41e..e2a28692 100644
--- a/leaf-server/minecraft-patches/features/0150-Micro-optimizations-for-random-tick.patch
+++ b/leaf-server/minecraft-patches/features/0149-Micro-optimizations-for-random-tick.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Micro optimizations for random tick
 
 
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index b5a61261083ddab70582c1a1d5cac0b9ced9b652..ab84d6a07c094b9fb23cd63504d7652342fd6974 100644
+index 9ba1c29b75ba0eb545097eef4fe568c53ebd885c..90bdcd168ad5b1a940f81b191bd59a34d3a33070 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -924,7 +924,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
diff --git a/leaf-server/minecraft-patches/features/0151-Remove-streams-on-updateConnectedPlayersWithinRange.patch b/leaf-server/minecraft-patches/features/0150-Remove-streams-on-updateConnectedPlayersWithinRange.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0151-Remove-streams-on-updateConnectedPlayersWithinRange.patch
rename to leaf-server/minecraft-patches/features/0150-Remove-streams-on-updateConnectedPlayersWithinRange.patch
diff --git a/leaf-server/minecraft-patches/features/0152-Remove-streams-on-PlayerDetector.patch b/leaf-server/minecraft-patches/features/0151-Remove-streams-on-PlayerDetector.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0152-Remove-streams-on-PlayerDetector.patch
rename to leaf-server/minecraft-patches/features/0151-Remove-streams-on-PlayerDetector.patch
diff --git a/leaf-server/minecraft-patches/features/0153-Async-Block-Finding.patch b/leaf-server/minecraft-patches/features/0152-Async-Block-Finding.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0153-Async-Block-Finding.patch
rename to leaf-server/minecraft-patches/features/0152-Async-Block-Finding.patch
diff --git a/leaf-server/minecraft-patches/features/0154-Use-direct-iteration-on-Sensing.tick.patch b/leaf-server/minecraft-patches/features/0153-Use-direct-iteration-on-Sensing.tick.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0154-Use-direct-iteration-on-Sensing.tick.patch
rename to leaf-server/minecraft-patches/features/0153-Use-direct-iteration-on-Sensing.tick.patch
diff --git a/leaf-server/minecraft-patches/features/0155-Optimise-non-flush-packet-sending.patch b/leaf-server/minecraft-patches/features/0154-Optimise-non-flush-packet-sending.patch
similarity index 94%
rename from leaf-server/minecraft-patches/features/0155-Optimise-non-flush-packet-sending.patch
rename to leaf-server/minecraft-patches/features/0154-Optimise-non-flush-packet-sending.patch
index f15568e7..137d91b4 100644
--- a/leaf-server/minecraft-patches/features/0155-Optimise-non-flush-packet-sending.patch
+++ b/leaf-server/minecraft-patches/features/0154-Optimise-non-flush-packet-sending.patch
@@ -26,7 +26,7 @@ Locally this patch drops the entity tracker tick by a full 1.5x.
 Co-authored-by: Quang Tran <3d7777456@gmail.com>
 
 diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java
-index 5b46036868b6c9d082e35591e58735e16adaae62..9563165c945757996da11f55e2221e620dd93327 100644
+index 00a82873d226f113278632a53c0faca420dd67d4..f3e9de8716f5e1a72ec465ee897c8f0413f7b1c3 100644
 --- a/net/minecraft/network/Connection.java
 +++ b/net/minecraft/network/Connection.java
 @@ -147,6 +147,7 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
@@ -45,7 +45,7 @@ index 5b46036868b6c9d082e35591e58735e16adaae62..9563165c945757996da11f55e2221e62
          this.address = this.channel.remoteAddress();
          this.preparing = false; // Spigot
          if (this.delayedDisconnect != null) {
-@@ -477,6 +479,11 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
+@@ -476,6 +478,11 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> {
          if (this.channel.eventLoop().inEventLoop()) {
              this.doSendPacket(packet, sendListener, flush);
          } else {
diff --git a/leaf-server/minecraft-patches/features/0156-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch b/leaf-server/minecraft-patches/features/0155-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0156-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch
rename to leaf-server/minecraft-patches/features/0155-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch
diff --git a/leaf-server/minecraft-patches/features/0157-AsyncTargetFinding.patch b/leaf-server/minecraft-patches/features/0156-AsyncTargetFinding.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0157-AsyncTargetFinding.patch
rename to leaf-server/minecraft-patches/features/0156-AsyncTargetFinding.patch
diff --git a/leaf-server/minecraft-patches/features/0158-Null-handling-on-MultifaceSpreader.patch b/leaf-server/minecraft-patches/features/0157-Null-handling-on-MultifaceSpreader.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0158-Null-handling-on-MultifaceSpreader.patch
rename to leaf-server/minecraft-patches/features/0157-Null-handling-on-MultifaceSpreader.patch
diff --git a/leaf-server/minecraft-patches/features/0159-More-virtual-threads.patch b/leaf-server/minecraft-patches/features/0158-More-virtual-threads.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0159-More-virtual-threads.patch
rename to leaf-server/minecraft-patches/features/0158-More-virtual-threads.patch