diff --git a/build.gradle.kts b/build.gradle.kts
index 9773a231..c9f5ef6e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -20,7 +20,7 @@ subprojects {
     }
 
     repositories {
-        mavenCentral()
+        maven("https://maven.aliyun.com/repository/public")
         maven(paperMavenPublicUrl)
         maven(leafMavenPublicUrl)
         maven("https://repo.bsdevelopment.org/releases/") // Leaf - Leaf config - ConfigurationMaster-API
diff --git a/leaf-api/build.gradle.kts.patch b/leaf-api/build.gradle.kts.patch
index 53d109c7..5d0a574e 100644
--- a/leaf-api/build.gradle.kts.patch
+++ b/leaf-api/build.gradle.kts.patch
@@ -184,7 +184,7 @@
  }
 +// Leaf start - Bump Dependencies
 +repositories {
-+    mavenCentral()
++    maven("https://maven.aliyun.com/repository/public")
 +}
 +// Leaf end - Bump Dependencies
  tasks.check {
diff --git a/leaf-server/minecraft-patches/features/0211-Bulk-writes-to-writeLongArray-during-chunk-loading.patch b/leaf-server/minecraft-patches/features/0209-Bulk-writes-to-writeLongArray-during-chunk-loading.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0211-Bulk-writes-to-writeLongArray-during-chunk-loading.patch
rename to leaf-server/minecraft-patches/features/0209-Bulk-writes-to-writeLongArray-during-chunk-loading.patch
diff --git a/leaf-server/minecraft-patches/features/0212-Improve-sorting-in-SortedArraySet.patch b/leaf-server/minecraft-patches/features/0210-Improve-sorting-in-SortedArraySet.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0212-Improve-sorting-in-SortedArraySet.patch
rename to leaf-server/minecraft-patches/features/0210-Improve-sorting-in-SortedArraySet.patch
diff --git a/leaf-server/minecraft-patches/features/0213-Make-removeIf-slightly-faster.patch b/leaf-server/minecraft-patches/features/0211-Make-removeIf-slightly-faster.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0213-Make-removeIf-slightly-faster.patch
rename to leaf-server/minecraft-patches/features/0211-Make-removeIf-slightly-faster.patch
diff --git a/leaf-server/minecraft-patches/features/0214-Optimize-LinearPalette.patch b/leaf-server/minecraft-patches/features/0212-Optimize-LinearPalette.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0214-Optimize-LinearPalette.patch
rename to leaf-server/minecraft-patches/features/0212-Optimize-LinearPalette.patch
diff --git a/leaf-server/minecraft-patches/features/0215-Slightly-optimized-VarInt-write.patch b/leaf-server/minecraft-patches/features/0213-Slightly-optimized-VarInt-write.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0215-Slightly-optimized-VarInt-write.patch
rename to leaf-server/minecraft-patches/features/0213-Slightly-optimized-VarInt-write.patch
diff --git a/leaf-server/minecraft-patches/features/0216-Rewrite-ClientboundLightUpdatePacketData.patch b/leaf-server/minecraft-patches/features/0214-Rewrite-ClientboundLightUpdatePacketData.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0216-Rewrite-ClientboundLightUpdatePacketData.patch
rename to leaf-server/minecraft-patches/features/0214-Rewrite-ClientboundLightUpdatePacketData.patch
diff --git a/leaf-server/minecraft-patches/features/0217-Async-chunk-send.patch b/leaf-server/minecraft-patches/features/0215-Async-chunk-send.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0217-Async-chunk-send.patch
rename to leaf-server/minecraft-patches/features/0215-Async-chunk-send.patch
diff --git a/leaf-server/minecraft-patches/features/0218-Spawner-Configurations.patch b/leaf-server/minecraft-patches/features/0216-Spawner-Configurations.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0218-Spawner-Configurations.patch
rename to leaf-server/minecraft-patches/features/0216-Spawner-Configurations.patch
diff --git a/leaf-server/minecraft-patches/features/0219-SparklyPaper-Parallel-world-ticking.patch b/leaf-server/minecraft-patches/features/0217-SparklyPaper-Parallel-world-ticking.patch
similarity index 99%
rename from leaf-server/minecraft-patches/features/0219-SparklyPaper-Parallel-world-ticking.patch
rename to leaf-server/minecraft-patches/features/0217-SparklyPaper-Parallel-world-ticking.patch
index 636d43fd..cc4952d3 100644
--- a/leaf-server/minecraft-patches/features/0219-SparklyPaper-Parallel-world-ticking.patch
+++ b/leaf-server/minecraft-patches/features/0217-SparklyPaper-Parallel-world-ticking.patch
@@ -396,7 +396,7 @@ index 54910c2e1d6e6bb556e536fda060bd09402e04e8..72e871b8c7fee9b5cbd567e03baee80e
  
          // Gale start - Pufferfish - SIMD support
 diff --git a/net/minecraft/server/level/ServerChunkCache.java b/net/minecraft/server/level/ServerChunkCache.java
-index 6d5a15122079f2d1568ceb7086db21ad454f58e6..9dd6205e1cdd2124ab9d91f0a1e344eb6aa1fb2e 100644
+index ecab2befa1f2f993ea4b4d088529745c2a37b73d..fc86e900e41305287a6cc6d766184c6e28d6189b 100644
 --- a/net/minecraft/server/level/ServerChunkCache.java
 +++ b/net/minecraft/server/level/ServerChunkCache.java
 @@ -175,7 +175,7 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
@@ -694,7 +694,7 @@ index d507544efafe74ecaffd6a063eff152d349ec76a..bc955da0dff79262dace84d255f27b32
          // Paper end - Inventory close reason
          this.connection.send(new ClientboundContainerClosePacket(this.containerMenu.containerId));
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 411ccee65f5658347839ca7d0fffeedc1f2814ce..f581fe86fea41bb5ff8f93e3422548ae7693a868 100644
+index 75393b9cdd564e55ba173828c2f7b40498e8ecd7..96202ffdb73cb9d8c63351b4538c64645b91d21c 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -252,6 +252,8 @@ public abstract class PlayerList {
diff --git a/leaf-server/minecraft-patches/features/0220-SparklyPaper-Track-each-world-MSPT.patch b/leaf-server/minecraft-patches/features/0218-SparklyPaper-Track-each-world-MSPT.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0220-SparklyPaper-Track-each-world-MSPT.patch
rename to leaf-server/minecraft-patches/features/0218-SparklyPaper-Track-each-world-MSPT.patch
diff --git a/leaf-server/minecraft-patches/features/0221-PaperPR-Fix-cancelled-Projectile-Events-still-consum.patch b/leaf-server/minecraft-patches/features/0219-PaperPR-Fix-cancelled-Projectile-Events-still-consum.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0221-PaperPR-Fix-cancelled-Projectile-Events-still-consum.patch
rename to leaf-server/minecraft-patches/features/0219-PaperPR-Fix-cancelled-Projectile-Events-still-consum.patch
diff --git a/leaf-server/minecraft-patches/features/0222-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch b/leaf-server/minecraft-patches/features/0220-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0222-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch
rename to leaf-server/minecraft-patches/features/0220-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch
diff --git a/leaf-server/minecraft-patches/features/0223-Remove-streams-on-InsideBrownianWalk.patch b/leaf-server/minecraft-patches/features/0221-Remove-streams-on-InsideBrownianWalk.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0223-Remove-streams-on-InsideBrownianWalk.patch
rename to leaf-server/minecraft-patches/features/0221-Remove-streams-on-InsideBrownianWalk.patch
diff --git a/leaf-server/minecraft-patches/features/0224-Use-BFS-on-getSlopeDistance.patch b/leaf-server/minecraft-patches/features/0222-Use-BFS-on-getSlopeDistance.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0224-Use-BFS-on-getSlopeDistance.patch
rename to leaf-server/minecraft-patches/features/0222-Use-BFS-on-getSlopeDistance.patch
diff --git a/leaf-server/minecraft-patches/features/0225-Paper-PR-Throttle-failed-spawn-attempts.patch b/leaf-server/minecraft-patches/features/0223-Paper-PR-Throttle-failed-spawn-attempts.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0225-Paper-PR-Throttle-failed-spawn-attempts.patch
rename to leaf-server/minecraft-patches/features/0223-Paper-PR-Throttle-failed-spawn-attempts.patch
diff --git a/leaf-server/minecraft-patches/features/0226-Improve-BlockEntity-ticking-isRemoved-check.patch b/leaf-server/minecraft-patches/features/0224-Improve-BlockEntity-ticking-isRemoved-check.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0226-Improve-BlockEntity-ticking-isRemoved-check.patch
rename to leaf-server/minecraft-patches/features/0224-Improve-BlockEntity-ticking-isRemoved-check.patch
diff --git a/leaf-server/minecraft-patches/features/0227-Raytrace-AntiXray-SDK-integration.patch b/leaf-server/minecraft-patches/features/0225-Raytrace-AntiXray-SDK-integration.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0227-Raytrace-AntiXray-SDK-integration.patch
rename to leaf-server/minecraft-patches/features/0225-Raytrace-AntiXray-SDK-integration.patch
diff --git a/leaf-server/minecraft-patches/features/0228-Optimize-addOrUpdateTransientModifier.patch b/leaf-server/minecraft-patches/features/0226-Optimize-addOrUpdateTransientModifier.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0228-Optimize-addOrUpdateTransientModifier.patch
rename to leaf-server/minecraft-patches/features/0226-Optimize-addOrUpdateTransientModifier.patch
diff --git a/leaf-server/minecraft-patches/features/0229-Optimize-ContextMap.create.patch b/leaf-server/minecraft-patches/features/0227-Optimize-ContextMap.create.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0229-Optimize-ContextMap.create.patch
rename to leaf-server/minecraft-patches/features/0227-Optimize-ContextMap.create.patch
diff --git a/leaf-server/minecraft-patches/features/0230-Micro-optimizations-for-random-tick.patch b/leaf-server/minecraft-patches/features/0228-Micro-optimizations-for-random-tick.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0230-Micro-optimizations-for-random-tick.patch
rename to leaf-server/minecraft-patches/features/0228-Micro-optimizations-for-random-tick.patch
diff --git a/leaf-server/minecraft-patches/features/0231-Remove-streams-on-updateConnectedPlayersWithinRange.patch b/leaf-server/minecraft-patches/features/0229-Remove-streams-on-updateConnectedPlayersWithinRange.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0231-Remove-streams-on-updateConnectedPlayersWithinRange.patch
rename to leaf-server/minecraft-patches/features/0229-Remove-streams-on-updateConnectedPlayersWithinRange.patch
diff --git a/leaf-server/minecraft-patches/features/0232-Remove-streams-on-PlayerDetector.patch b/leaf-server/minecraft-patches/features/0230-Remove-streams-on-PlayerDetector.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0232-Remove-streams-on-PlayerDetector.patch
rename to leaf-server/minecraft-patches/features/0230-Remove-streams-on-PlayerDetector.patch
diff --git a/leaf-server/minecraft-patches/features/0233-Use-direct-iteration-on-Sensing.tick.patch b/leaf-server/minecraft-patches/features/0231-Use-direct-iteration-on-Sensing.tick.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0233-Use-direct-iteration-on-Sensing.tick.patch
rename to leaf-server/minecraft-patches/features/0231-Use-direct-iteration-on-Sensing.tick.patch
diff --git a/leaf-server/minecraft-patches/features/0234-Optimise-non-flush-packet-sending.patch b/leaf-server/minecraft-patches/features/0232-Optimise-non-flush-packet-sending.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0234-Optimise-non-flush-packet-sending.patch
rename to leaf-server/minecraft-patches/features/0232-Optimise-non-flush-packet-sending.patch
diff --git a/leaf-server/minecraft-patches/features/0235-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch b/leaf-server/minecraft-patches/features/0233-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0235-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch
rename to leaf-server/minecraft-patches/features/0233-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch
diff --git a/leaf-server/minecraft-patches/features/0236-Null-handling-on-MultifaceSpreader.patch b/leaf-server/minecraft-patches/features/0234-Null-handling-on-MultifaceSpreader.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0236-Null-handling-on-MultifaceSpreader.patch
rename to leaf-server/minecraft-patches/features/0234-Null-handling-on-MultifaceSpreader.patch
diff --git a/leaf-server/minecraft-patches/features/0237-More-virtual-threads.patch b/leaf-server/minecraft-patches/features/0235-More-virtual-threads.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0237-More-virtual-threads.patch
rename to leaf-server/minecraft-patches/features/0235-More-virtual-threads.patch
diff --git a/leaf-server/minecraft-patches/features/0238-Async-target-finding.patch b/leaf-server/minecraft-patches/features/0236-Async-target-finding.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0238-Async-target-finding.patch
rename to leaf-server/minecraft-patches/features/0236-Async-target-finding.patch
diff --git a/leaf-server/minecraft-patches/features/0239-Optimize-ThreadedTicketLevelPropagator.patch b/leaf-server/minecraft-patches/features/0237-Optimize-ThreadedTicketLevelPropagator.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0239-Optimize-ThreadedTicketLevelPropagator.patch
rename to leaf-server/minecraft-patches/features/0237-Optimize-ThreadedTicketLevelPropagator.patch
diff --git a/leaf-server/minecraft-patches/features/0240-Optimise-MobEffectUtil-getDigSpeedAmplification.patch b/leaf-server/minecraft-patches/features/0238-Optimise-MobEffectUtil-getDigSpeedAmplification.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0240-Optimise-MobEffectUtil-getDigSpeedAmplification.patch
rename to leaf-server/minecraft-patches/features/0238-Optimise-MobEffectUtil-getDigSpeedAmplification.patch
diff --git a/leaf-server/minecraft-patches/features/0241-Optimise-chunkUnloads.patch b/leaf-server/minecraft-patches/features/0239-Optimise-chunkUnloads.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0241-Optimise-chunkUnloads.patch
rename to leaf-server/minecraft-patches/features/0239-Optimise-chunkUnloads.patch
diff --git a/leaf-server/minecraft-patches/features/0242-Optimize-BlockEntityType-isValid.patch b/leaf-server/minecraft-patches/features/0240-Optimize-BlockEntityType-isValid.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0242-Optimize-BlockEntityType-isValid.patch
rename to leaf-server/minecraft-patches/features/0240-Optimize-BlockEntityType-isValid.patch
diff --git a/leaf-server/minecraft-patches/features/0243-PaperPR-Add-ticket-on-player-join-to-avoid-chunk-loa.patch b/leaf-server/minecraft-patches/features/0241-PaperPR-Add-ticket-on-player-join-to-avoid-chunk-loa.patch
similarity index 97%
rename from leaf-server/minecraft-patches/features/0243-PaperPR-Add-ticket-on-player-join-to-avoid-chunk-loa.patch
rename to leaf-server/minecraft-patches/features/0241-PaperPR-Add-ticket-on-player-join-to-avoid-chunk-loa.patch
index 6164374f..0bd1b382 100644
--- a/leaf-server/minecraft-patches/features/0243-PaperPR-Add-ticket-on-player-join-to-avoid-chunk-loa.patch
+++ b/leaf-server/minecraft-patches/features/0241-PaperPR-Add-ticket-on-player-join-to-avoid-chunk-loa.patch
@@ -27,7 +27,7 @@ index 3a78e7512772fd3f7cf8f221e3a72474def14bea..ba52af914e9e231caa0ac50562e9a692
      public static final int GENERATED_TICKET_LEVEL = ChunkHolderManager.FULL_LOADED_TICKET_LEVEL;
      public static final int LOADED_TICKET_LEVEL = ChunkTaskScheduler.getTicketLevel(ChunkStatus.EMPTY);
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index a1249d66c3693374b0f57c83302d05a7cbc2a306..2ea112ed64d5dc7c5eb365e7a518cf0e8dd4927f 100644
+index 96202ffdb73cb9d8c63351b4538c64645b91d21c..65857e4799186b7166fb0023694dc2749a492546 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -434,6 +434,13 @@ public abstract class PlayerList {
diff --git a/leaf-server/minecraft-patches/features/0244-Sakura-Optimise-check-inside-blocks-and-traverse-blo.patch b/leaf-server/minecraft-patches/features/0242-Sakura-Optimise-check-inside-blocks-and-traverse-blo.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0244-Sakura-Optimise-check-inside-blocks-and-traverse-blo.patch
rename to leaf-server/minecraft-patches/features/0242-Sakura-Optimise-check-inside-blocks-and-traverse-blo.patch
diff --git a/leaf-server/minecraft-patches/features/0245-Sakura-copy-EntityList-implementation-to-BasicEntity.patch b/leaf-server/minecraft-patches/features/0243-Sakura-copy-EntityList-implementation-to-BasicEntity.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0245-Sakura-copy-EntityList-implementation-to-BasicEntity.patch
rename to leaf-server/minecraft-patches/features/0243-Sakura-copy-EntityList-implementation-to-BasicEntity.patch
diff --git a/leaf-server/minecraft-patches/features/0246-Protocol-Core.patch b/leaf-server/minecraft-patches/features/0244-Protocol-Core.patch
similarity index 97%
rename from leaf-server/minecraft-patches/features/0246-Protocol-Core.patch
rename to leaf-server/minecraft-patches/features/0244-Protocol-Core.patch
index 95507dd5..76cb2ca5 100644
--- a/leaf-server/minecraft-patches/features/0246-Protocol-Core.patch
+++ b/leaf-server/minecraft-patches/features/0244-Protocol-Core.patch
@@ -59,7 +59,7 @@ index 18f0d486c478087f404d8bb6cd840079e2c8d239..1a6f1c5f4cf13ee50bc8445845cbb973
          final byte[] data = discardedPayload.data();
          try {
 diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
-index 08d956368ced372d5a5e03b74a7fff4c9dc43283..978f9c5c54278d3d2bbb51461ab4ae6fcdd14d26 100644
+index 65857e4799186b7166fb0023694dc2749a492546..1c1f24902575233109ea4122d68e1bb0bc0ace40 100644
 --- a/net/minecraft/server/players/PlayerList.java
 +++ b/net/minecraft/server/players/PlayerList.java
 @@ -687,6 +687,7 @@ public abstract class PlayerList {
diff --git a/leaf-server/minecraft-patches/features/0247-Reduce-PlayerChunk-Updates.patch b/leaf-server/minecraft-patches/features/0245-Reduce-PlayerChunk-Updates.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0247-Reduce-PlayerChunk-Updates.patch
rename to leaf-server/minecraft-patches/features/0245-Reduce-PlayerChunk-Updates.patch
diff --git a/leaf-server/minecraft-patches/features/0248-Async-switch-connection-state.patch b/leaf-server/minecraft-patches/features/0246-Async-switch-connection-state.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0248-Async-switch-connection-state.patch
rename to leaf-server/minecraft-patches/features/0246-Async-switch-connection-state.patch
diff --git a/leaf-server/minecraft-patches/features/0249-Optimize-BlockEntities-tickersInLevel.patch b/leaf-server/minecraft-patches/features/0247-Optimize-BlockEntities-tickersInLevel.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0249-Optimize-BlockEntities-tickersInLevel.patch
rename to leaf-server/minecraft-patches/features/0247-Optimize-BlockEntities-tickersInLevel.patch
diff --git a/leaf-server/minecraft-patches/features/0250-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch b/leaf-server/minecraft-patches/features/0248-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0250-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch
rename to leaf-server/minecraft-patches/features/0248-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch
diff --git a/leaf-server/minecraft-patches/features/0251-Flush-location-while-knockback.patch b/leaf-server/minecraft-patches/features/0249-Flush-location-while-knockback.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0251-Flush-location-while-knockback.patch
rename to leaf-server/minecraft-patches/features/0249-Flush-location-while-knockback.patch
diff --git a/leaf-server/minecraft-patches/features/0252-Only-tick-items-at-hand.patch b/leaf-server/minecraft-patches/features/0250-Only-tick-items-at-hand.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0252-Only-tick-items-at-hand.patch
rename to leaf-server/minecraft-patches/features/0250-Only-tick-items-at-hand.patch
diff --git a/leaf-server/minecraft-patches/features/0253-Smart-sort-items-in-NearestItemSensor.patch b/leaf-server/minecraft-patches/features/0251-Smart-sort-items-in-NearestItemSensor.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0253-Smart-sort-items-in-NearestItemSensor.patch
rename to leaf-server/minecraft-patches/features/0251-Smart-sort-items-in-NearestItemSensor.patch
diff --git a/leaf-server/minecraft-patches/features/0254-Optimise-player-movement-checks.patch b/leaf-server/minecraft-patches/features/0252-Optimise-player-movement-checks.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0254-Optimise-player-movement-checks.patch
rename to leaf-server/minecraft-patches/features/0252-Optimise-player-movement-checks.patch
diff --git a/leaf-server/minecraft-patches/features/0255-Remove-streams-in-MobSensor.patch b/leaf-server/minecraft-patches/features/0253-Remove-streams-in-MobSensor.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0255-Remove-streams-in-MobSensor.patch
rename to leaf-server/minecraft-patches/features/0253-Remove-streams-in-MobSensor.patch
diff --git a/leaf-server/minecraft-patches/features/0256-Remove-streams-in-TemptingSensor.patch b/leaf-server/minecraft-patches/features/0254-Remove-streams-in-TemptingSensor.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0256-Remove-streams-in-TemptingSensor.patch
rename to leaf-server/minecraft-patches/features/0254-Remove-streams-in-TemptingSensor.patch
diff --git a/leaf-server/minecraft-patches/features/0257-Use-HashedList-on-WeightedList.patch b/leaf-server/minecraft-patches/features/0255-Use-HashedList-on-WeightedList.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0257-Use-HashedList-on-WeightedList.patch
rename to leaf-server/minecraft-patches/features/0255-Use-HashedList-on-WeightedList.patch
diff --git a/leaf-server/minecraft-patches/features/0258-Add-configurable-death-item-drop-knockback-settings.patch b/leaf-server/minecraft-patches/features/0256-Add-configurable-death-item-drop-knockback-settings.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0258-Add-configurable-death-item-drop-knockback-settings.patch
rename to leaf-server/minecraft-patches/features/0256-Add-configurable-death-item-drop-knockback-settings.patch
diff --git a/leaf-server/minecraft-patches/features/0259-Optimize-getScaledTrackingDistance.patch b/leaf-server/minecraft-patches/features/0257-Optimize-getScaledTrackingDistance.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0259-Optimize-getScaledTrackingDistance.patch
rename to leaf-server/minecraft-patches/features/0257-Optimize-getScaledTrackingDistance.patch
diff --git a/leaf-server/minecraft-patches/features/0260-Optimize-SynchedEntityData-packDirty.patch b/leaf-server/minecraft-patches/features/0258-Optimize-SynchedEntityData-packDirty.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0260-Optimize-SynchedEntityData-packDirty.patch
rename to leaf-server/minecraft-patches/features/0258-Optimize-SynchedEntityData-packDirty.patch
diff --git a/leaf-server/minecraft-patches/features/0261-Optimize-isEyeInFluid.patch b/leaf-server/minecraft-patches/features/0259-Optimize-isEyeInFluid.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0261-Optimize-isEyeInFluid.patch
rename to leaf-server/minecraft-patches/features/0259-Optimize-isEyeInFluid.patch
diff --git a/leaf-server/minecraft-patches/features/0262-Cache-block-path-type.patch b/leaf-server/minecraft-patches/features/0260-Cache-block-path-type.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0262-Cache-block-path-type.patch
rename to leaf-server/minecraft-patches/features/0260-Cache-block-path-type.patch
diff --git a/leaf-server/minecraft-patches/features/0263-optimize-getEntityStatus.patch b/leaf-server/minecraft-patches/features/0261-optimize-getEntityStatus.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0263-optimize-getEntityStatus.patch
rename to leaf-server/minecraft-patches/features/0261-optimize-getEntityStatus.patch
diff --git a/leaf-server/minecraft-patches/features/0264-Rail-Optimization-optimized-PoweredRailBlock-logic.patch b/leaf-server/minecraft-patches/features/0262-Rail-Optimization-optimized-PoweredRailBlock-logic.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0264-Rail-Optimization-optimized-PoweredRailBlock-logic.patch
rename to leaf-server/minecraft-patches/features/0262-Rail-Optimization-optimized-PoweredRailBlock-logic.patch
diff --git a/leaf-server/minecraft-patches/features/0265-optimise-ChunkGenerator-getMobsAt.patch b/leaf-server/minecraft-patches/features/0263-optimise-ChunkGenerator-getMobsAt.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0265-optimise-ChunkGenerator-getMobsAt.patch
rename to leaf-server/minecraft-patches/features/0263-optimise-ChunkGenerator-getMobsAt.patch
diff --git a/leaf-server/minecraft-patches/features/0266-optimise-getBiome.patch b/leaf-server/minecraft-patches/features/0264-optimise-getBiome.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0266-optimise-getBiome.patch
rename to leaf-server/minecraft-patches/features/0264-optimise-getBiome.patch
diff --git a/leaf-server/minecraft-patches/features/0267-optimize-mob-spawning.patch b/leaf-server/minecraft-patches/features/0265-optimize-mob-spawning.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0267-optimize-mob-spawning.patch
rename to leaf-server/minecraft-patches/features/0265-optimize-mob-spawning.patch
diff --git a/leaf-server/minecraft-patches/features/0268-optimize-structure-map.patch b/leaf-server/minecraft-patches/features/0266-optimize-structure-map.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0268-optimize-structure-map.patch
rename to leaf-server/minecraft-patches/features/0266-optimize-structure-map.patch
diff --git a/leaf-server/minecraft-patches/features/0269-throttle-mob-spawning.patch b/leaf-server/minecraft-patches/features/0267-throttle-mob-spawning.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0269-throttle-mob-spawning.patch
rename to leaf-server/minecraft-patches/features/0267-throttle-mob-spawning.patch
diff --git a/leaf-server/minecraft-patches/features/0270-Add-BlockExplosionHitEvent.patch b/leaf-server/minecraft-patches/features/0268-Add-BlockExplosionHitEvent.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0270-Add-BlockExplosionHitEvent.patch
rename to leaf-server/minecraft-patches/features/0268-Add-BlockExplosionHitEvent.patch
diff --git a/leaf-server/minecraft-patches/features/0271-Old-Blast-Protection-explosion-knockback.patch b/leaf-server/minecraft-patches/features/0269-Old-Blast-Protection-explosion-knockback.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0271-Old-Blast-Protection-explosion-knockback.patch
rename to leaf-server/minecraft-patches/features/0269-Old-Blast-Protection-explosion-knockback.patch
diff --git a/leaf-server/minecraft-patches/features/0272-Use-UUID-for-cure-reputation.patch b/leaf-server/minecraft-patches/features/0270-Use-UUID-for-cure-reputation.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0272-Use-UUID-for-cure-reputation.patch
rename to leaf-server/minecraft-patches/features/0270-Use-UUID-for-cure-reputation.patch
diff --git a/leaf-server/minecraft-patches/features/0273-Cache-potential-behaviors-in-Brain.patch b/leaf-server/minecraft-patches/features/0271-Cache-potential-behaviors-in-Brain.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0273-Cache-potential-behaviors-in-Brain.patch
rename to leaf-server/minecraft-patches/features/0271-Cache-potential-behaviors-in-Brain.patch
diff --git a/leaf-server/minecraft-patches/features/0274-Use-ActivationList-on-runningBehaviors.patch b/leaf-server/minecraft-patches/features/0272-Use-ActivationList-on-runningBehaviors.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0274-Use-ActivationList-on-runningBehaviors.patch
rename to leaf-server/minecraft-patches/features/0272-Use-ActivationList-on-runningBehaviors.patch
diff --git a/leaf-server/minecraft-patches/features/0275-Paper-Fix-excess-slot-updates.patch b/leaf-server/minecraft-patches/features/0273-Paper-Fix-excess-slot-updates.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0275-Paper-Fix-excess-slot-updates.patch
rename to leaf-server/minecraft-patches/features/0273-Paper-Fix-excess-slot-updates.patch
diff --git a/leaf-server/minecraft-patches/features/0276-Fix-crash-during-parsing-unknown-command-message.patch b/leaf-server/minecraft-patches/features/0274-Fix-crash-during-parsing-unknown-command-message.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0276-Fix-crash-during-parsing-unknown-command-message.patch
rename to leaf-server/minecraft-patches/features/0274-Fix-crash-during-parsing-unknown-command-message.patch
diff --git a/leaf-server/minecraft-patches/features/0277-Paper-Rewrite-dataconverter-system.patch b/leaf-server/minecraft-patches/features/0275-Paper-Rewrite-dataconverter-system.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0277-Paper-Rewrite-dataconverter-system.patch
rename to leaf-server/minecraft-patches/features/0275-Paper-Rewrite-dataconverter-system.patch
diff --git a/leaf-server/minecraft-patches/features/0278-optimize-random-tick.patch b/leaf-server/minecraft-patches/features/0276-optimize-random-tick.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0278-optimize-random-tick.patch
rename to leaf-server/minecraft-patches/features/0276-optimize-random-tick.patch
diff --git a/leaf-server/minecraft-patches/features/0279-do-not-log-invalid-flatten-text-component-parse.patch b/leaf-server/minecraft-patches/features/0277-do-not-log-invalid-flatten-text-component-parse.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0279-do-not-log-invalid-flatten-text-component-parse.patch
rename to leaf-server/minecraft-patches/features/0277-do-not-log-invalid-flatten-text-component-parse.patch
diff --git a/leaf-server/minecraft-patches/features/0280-Fast-BiomeManager-seed-obfuscation.patch b/leaf-server/minecraft-patches/features/0278-Fast-BiomeManager-seed-obfuscation.patch
similarity index 100%
rename from leaf-server/minecraft-patches/features/0280-Fast-BiomeManager-seed-obfuscation.patch
rename to leaf-server/minecraft-patches/features/0278-Fast-BiomeManager-seed-obfuscation.patch
diff --git a/leaf-server/minecraft-patches/features/0281-Paw-optimization.patch b/leaf-server/minecraft-patches/features/0279-Paw-optimization.patch
similarity index 99%
rename from leaf-server/minecraft-patches/features/0281-Paw-optimization.patch
rename to leaf-server/minecraft-patches/features/0279-Paw-optimization.patch
index 4e9029bb..c2693f54 100644
--- a/leaf-server/minecraft-patches/features/0281-Paw-optimization.patch
+++ b/leaf-server/minecraft-patches/features/0279-Paw-optimization.patch
@@ -100,7 +100,7 @@ index 4535858701b2bb232b9d2feb2af6551526232ddc..e65c62dbe4c1560ae153e4c4344e9194
 -    // Paper end - detailed watchdog information
  }
 diff --git a/net/minecraft/server/level/ServerChunkCache.java b/net/minecraft/server/level/ServerChunkCache.java
-index 9286312e11b98e4873f1ca13cf210feadcd6a2d7..014fb76ad0e57048d036659bd89e628fd81a0190 100644
+index 3f3450e79f768f9c9fa4f2c0fe485b7179419680..f16760c8817d0220f0a44ed620859ba910bf63a9 100644
 --- a/net/minecraft/server/level/ServerChunkCache.java
 +++ b/net/minecraft/server/level/ServerChunkCache.java
 @@ -622,8 +622,10 @@ public class ServerChunkCache extends ChunkSource implements ca.spottedleaf.moon
diff --git a/leaf-server/minecraft-patches/features/0280-Paper-Improve-Fix-MC-44654.patch b/leaf-server/minecraft-patches/features/0280-Paper-Improve-Fix-MC-44654.patch
new file mode 100644
index 00000000..34c4fa21
--- /dev/null
+++ b/leaf-server/minecraft-patches/features/0280-Paper-Improve-Fix-MC-44654.patch
@@ -0,0 +1,46 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Owen <23108066+Owen1212055@users.noreply.github.com>
+Date: Fri, 20 Jun 2025 16:02:24 -0400
+Subject: [PATCH] Paper: Improve Fix MC-44654
+
+Original license: GPLv3
+Original project: https://github.com/PaperMC/Paper
+
+https://github.com/PaperMC/Paper/commit/4b3f967e49f069ca94535f1ef5c2695cc8eadc4a
+
+This more properly implement spigot's fix for teleportation area effect clouds,
+now however supporting many other entity types specified in this bug report.
+
+Currently, this is not an issue for (all) hanging blocks since they have a fix identical to this inside of setPos.
+Note however the client does not nicely support moving these entities anyways.
+
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
+index 5fda5eadd37ec52ca6470d4aeb18a20c192811be..8ef27db6cefdf63ee87b0fb3cc019803ed056b0f 100644
+--- a/net/minecraft/world/entity/Entity.java
++++ b/net/minecraft/world/entity/Entity.java
+@@ -4957,6 +4957,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+             }
+ 
+             this.levelCallback.onMove();
++
++            // Paper start - Fix MC-44654Add commentMore actions
++            if (this.getType().updateInterval() == Integer.MAX_VALUE) {
++                this.hasImpulse = true;
++            }
++            // Paper end - Fix MC-44654
+         }
+         // Paper start - Block invalid positions and bounding box; don't allow desync of pos and AABB
+         // hanging has its own special logic
+diff --git a/net/minecraft/world/entity/EntityType.java b/net/minecraft/world/entity/EntityType.java
+index d92045528d1a63799322418d86fab0bc580b7a99..8e8cf73082478b991f929beef678dcf9be70ac8a 100644
+--- a/net/minecraft/world/entity/EntityType.java
++++ b/net/minecraft/world/entity/EntityType.java
+@@ -216,7 +216,7 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
+             .fireImmune()
+             .sized(6.0F, 0.5F)
+             .clientTrackingRange(10)
+-            .updateInterval(10) // CraftBukkit - SPIGOT-3729: track area effect clouds
++            .updateInterval(Integer.MAX_VALUE)
+     );
+     public static final EntityType<Armadillo> ARMADILLO = register(
+         "armadillo", EntityType.Builder.of(Armadillo::new, MobCategory.CREATURE).sized(0.7F, 0.65F).eyeHeight(0.26F).clientTrackingRange(10)
diff --git a/leaf-server/minecraft-patches/features/0281-Paper-Cleanup-Primed-TNT-Fix.patch b/leaf-server/minecraft-patches/features/0281-Paper-Cleanup-Primed-TNT-Fix.patch
new file mode 100644
index 00000000..c414e012
--- /dev/null
+++ b/leaf-server/minecraft-patches/features/0281-Paper-Cleanup-Primed-TNT-Fix.patch
@@ -0,0 +1,45 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Owen <23108066+Owen1212055@users.noreply.github.com>
+Date: Fri, 20 Jun 2025 18:22:37 -0400
+Subject: [PATCH] Paper: Cleanup Primed TNT Fix
+
+Original license: GPLv3
+Original project: https://github.com/PaperMC/Paper
+
+https://github.com/PaperMC/Paper/commit/6a51c44ec28830094de58528fd8107c4be5cefe0
+
+This option should probably be removed as its a descendant of an option that allows "old tnt cannon" behavior before ~1.9
+But this improves the fix so properly update the velocity/position rather than the questionable way it was doing it before.
+
+diff --git a/net/minecraft/world/entity/item/PrimedTnt.java b/net/minecraft/world/entity/item/PrimedTnt.java
+index 8aedc3ca463745fe32cac977208b23dc0b8e73b6..2b12316a7e8f26a7d09e3de1da57166b02a08a8a 100644
+--- a/net/minecraft/world/entity/item/PrimedTnt.java
++++ b/net/minecraft/world/entity/item/PrimedTnt.java
+@@ -135,25 +135,8 @@ public class PrimedTnt extends Entity implements TraceableEntity {
+         }
+         // Paper start - Option to prevent TNT from moving in water
+         if (!this.isRemoved() && this.wasTouchingWater && this.level().paperConfig().fixes.preventTntFromMovingInWater) {
+-            /*
+-             * Author: Jedediah Smith <jedediah@silencegreys.com>
+-             */
+-            // Send position and velocity updates to nearby players on every tick while the TNT is in water.
+-            // This does pretty well at keeping their clients in sync with the server.
+-            net.minecraft.server.level.ChunkMap.TrackedEntity ete = ((net.minecraft.server.level.ServerLevel) this.level()).getChunkSource().chunkMap.entityMap.get(this.getId());
+-            if (ete != null) {
+-                net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket velocityPacket = new net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket(this);
+-                net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket positionPacket = net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket.teleport(this.getId(), net.minecraft.world.entity.PositionMoveRotation.of(this), java.util.Set.of(), this.onGround);
+-
+-                // Leaf start - Multithreaded tracker
+-                for (var viewer : ete.seenBy()) {
+-                    if ((viewer.getPlayer().getX() - this.getX()) * (viewer.getPlayer().getY() - this.getY()) * (viewer.getPlayer().getZ() - this.getZ()) < 16 * 16) {
+-                        viewer.send(velocityPacket);
+-                        viewer.send(positionPacket);
+-                    }
+-                }
+-                // Leaf end - Multithreaded tracker
+-            }
++            this.hurtMarked = true; // Paper - Cleanup Primed TNT Fix
++            this.hasImpulse = true; // Paper - Cleanup Primed TNT Fix
+         }
+         // Paper end - Option to prevent TNT from moving in water
+     }
diff --git a/leaf-server/minecraft-patches/features/0282-Paper-Fix-Raids-illager-ominus-banner-pickup-mechani.patch b/leaf-server/minecraft-patches/features/0282-Paper-Fix-Raids-illager-ominus-banner-pickup-mechani.patch
new file mode 100644
index 00000000..c4789c17
--- /dev/null
+++ b/leaf-server/minecraft-patches/features/0282-Paper-Fix-Raids-illager-ominus-banner-pickup-mechani.patch
@@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Owen <23108066+Owen1212055@users.noreply.github.com>
+Date: Fri, 20 Jun 2025 19:22:27 -0400
+Subject: [PATCH] Paper: Fix Raids - illager ominus banner pickup mechanic
+ broken
+
+Original license: GPLv3
+Original project: https://github.com/PaperMC/Paper
+
+https://github.com/PaperMC/Paper/commit/839c6a184586c00a97c9a1892aa7384e33d8984f
+
+This technically fixes the improperly updated patch, and also no longer checks canPickUpLoot.
+
+diff --git a/net/minecraft/world/entity/raid/Raider.java b/net/minecraft/world/entity/raid/Raider.java
+index 76ebbab40f5bac6d5f588410d3c5e6716cbe0679..70460f52910f0a123225699f1ede3f96c910d920 100644
+--- a/net/minecraft/world/entity/raid/Raider.java
++++ b/net/minecraft/world/entity/raid/Raider.java
+@@ -400,7 +400,7 @@ public abstract class Raider extends PatrollingMonster {
+         }
+ 
+         private boolean cannotPickUpBanner() {
+-            if (!getServerLevel(this.mob).getGameRules().getBoolean(net.minecraft.world.level.GameRules.RULE_MOBGRIEFING, this.mob.level().purpurConfig.pillagerMobGriefingOverride) || !this.mob.canPickUpLoot()) return false; // Paper - respect game and entity rules for picking up items // Purpur - Add mobGriefing override to everything affected
++            if (!getServerLevel(this.mob).getGameRules().getBoolean(net.minecraft.world.level.GameRules.RULE_MOBGRIEFING, this.mob.level().purpurConfig.pillagerMobGriefingOverride)) return true; // Paper - respect game and entity rules for picking up items // Purpur - Add mobGriefing override to everything affected // Paper - Fix Raids - illager ominus banner pickup mechanic broken
+             if (!this.mob.hasActiveRaid()) {
+                 return true;
+             } else if (this.mob.getCurrentRaid().isOver()) {