diff --git a/patches/server/0004-Leaves-Server-Config-And-Command.patch b/patches/server/0004-Leaves-Server-Config-And-Command.patch
index 0759f36e..bd91f9b4 100644
--- a/patches/server/0004-Leaves-Server-Config-And-Command.patch
+++ b/patches/server/0004-Leaves-Server-Config-And-Command.patch
@@ -128,10 +128,10 @@ index c9263cf970b82a2ee24d10202c21ac30bfd925dc..c20debb13d8496ad7c0ef1eaf5eae1c4
                          .withRequiredArg()
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..6373811568735b38d8812b29112b91c57f4d53ea
+index 0000000000000000000000000000000000000000..ba0daabf8104b2a16169b65544eeeb948f04233f
 --- /dev/null
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-@@ -0,0 +1,963 @@
+@@ -0,0 +1,958 @@
 +package top.leavesmc.leaves;
 +
 +import com.destroystokyo.paper.util.SneakyThrow;
@@ -369,11 +369,6 @@ index 0000000000000000000000000000000000000000..6373811568735b38d8812b29112b91c5
 +            asyncMobSpawning = getBoolean("settings.performance.async-mob-spawning", asyncMobSpawning);
 +            asyncMobSpawningLock = true;
 +        }
-+
-+        if (asyncMobSpawning) {
-+            asyncMobSpawning = false;
-+            LeavesLogger.LOGGER.severe("Async MobSpawning is updating, it can't work");
-+        }
 +    }
 +
 +    public static boolean dontSendUselessEntityPackets = true;
diff --git a/patches/server/0017-Optimize-mob-spawning.patch b/patches/server/0017-Optimize-mob-spawning.patch
index 54341e85..0509f4cc 100644
--- a/patches/server/0017-Optimize-mob-spawning.patch
+++ b/patches/server/0017-Optimize-mob-spawning.patch
@@ -5,16 +5,153 @@ Subject: [PATCH] Optimize mob spawning
 
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
-diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index 5922446ebbe64d1b001c505d6c5267417e0e7083..7a3086850da4894002a22d80d7f7cb9a1534cd6b 100644
---- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-@@ -238,7 +238,7 @@ public final class LeavesConfig {
-         noChatSign = getBoolean("settings.misc.no-chat-sign", noChatSign);
+diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+index 307d4fd4b52aa654f859aab34126048b6a127dde..a1cf15fc45111508657efe3a4d7f48bfe27dcd9f 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -313,6 +313,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     public volatile boolean abnormalExit = false; // Paper
+     public boolean isIteratingOverLevels = false; // Paper
+ 
++    public top.leavesmc.leaves.util.AsyncExecutor mobSpawnExecutor = new top.leavesmc.leaves.util.AsyncExecutor("MobSpawning"); // Leaves - optimize mob spawning
++
+     public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
+         AtomicReference<S> atomicreference = new AtomicReference();
+         Thread thread = new io.papermc.paper.util.TickThread(() -> { // Paper - rewrite chunk system
+diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+index 9abc92d8c98c1075ebc74e9dc4290b887913cc29..06cf3bbf50b941d3504de7198c5ca44ed5af2ff0 100644
+--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
++++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+@@ -343,6 +343,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+                 DedicatedServer.LOGGER.info("JMX monitoring enabled");
+             }
+ 
++            // Leaves start - optimize mob spawning
++            if (top.leavesmc.leaves.LeavesConfig.asyncMobSpawning) {
++                mobSpawnExecutor.start();
++            }
++            // Leaves end - optimize mob spawning
+             return true;
+         }
+     }
+diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
+index 469083208110d5735e1bbda7a15c55a032d0e8cc..cd063db781b461409ec3b3cfb499b43b8da07b54 100644
+--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
++++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
+@@ -342,7 +342,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+         this.dataRegionManager = new io.papermc.paper.chunk.SingleThreadChunkRegionManager(this.level, 2, (1.0 / 3.0), 1, 6, "Data", DataRegionData::new, DataRegionSectionData::new);
+         this.regionManagers.add(this.dataRegionManager);
+         // Paper end
+-        this.playerMobDistanceMap = this.level.paperConfig().entities.spawning.perPlayerMobSpawns ? new com.destroystokyo.paper.util.misc.PlayerAreaMap(this.pooledLinkedPlayerHashSets) : null; // Paper
++        this.playerMobDistanceMap = this.level.paperConfig().entities.spawning.perPlayerMobSpawns ? top.leavesmc.leaves.LeavesConfig.asyncMobSpawning ? new top.leavesmc.leaves.util.AsyncPlayerAreaMap(this.pooledLinkedPlayerHashSets) : new com.destroystokyo.paper.util.misc.PlayerAreaMap(this.pooledLinkedPlayerHashSets) : null; // Paper // Leaves - optimize mob spawning
+         // Paper start - use distance map to optimise entity tracker
+         this.playerEntityTrackerTrackMaps = new com.destroystokyo.paper.util.misc.PlayerAreaMap[TRACKING_RANGE_TYPES.length];
+         this.entityTrackerTrackRanges = new int[TRACKING_RANGE_TYPES.length];
+diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+index 488a253e218409b5f0b4a872cee0928578fa7582..edafe1f60aab84b9eda5c4b7462552a3b23e19ff 100644
+--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
++++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+@@ -77,6 +77,11 @@ public class ServerChunkCache extends ChunkSource {
+ 
+     private final LevelChunk[] lastLoadedChunks = new LevelChunk[4 * 4];
+ 
++    // Leaves start - optimize mob spawning
++    public boolean firstRunSpawnCounts = true;
++    public final java.util.concurrent.atomic.AtomicBoolean spawnCountsReady = new java.util.concurrent.atomic.AtomicBoolean(false);
++    // Leaves end - optimize mob spawning
++
+     private static int getChunkCacheKey(int x, int z) {
+         return x & 3 | ((z & 3) << 2);
+     }
+@@ -562,18 +567,25 @@ public class ServerChunkCache extends ChunkSource {
+             // Paper start - per player mob spawning
+             NaturalSpawner.SpawnState spawnercreature_d; // moved down
+             if ((this.spawnFriendlies || this.spawnEnemies) && this.chunkMap.playerMobDistanceMap != null) { // don't count mobs when animals and monsters are disabled
+-                // re-set mob counts
+-                for (ServerPlayer player : this.level.players) {
+-                    Arrays.fill(player.mobCounts, 0);
++                    // Leaves start - optimize mob spawning
++                    if (!top.leavesmc.leaves.LeavesConfig.asyncMobSpawning) {
++                        // re-set mob counts
++                        for (ServerPlayer player : this.level.players) {
++                            Arrays.fill(player.mobCounts, 0);
++                        }
++                        lastSpawnState = NaturalSpawner.createState(l, this.level.getAllEntities(), this::getFullChunk, null, true);
++                    }
++                    // Leaves end - optimize mob spawning
++                } else {
++                    // Leaves start - optimize mob spawning
++                    lastSpawnState = NaturalSpawner.createState(l, this.level.getAllEntities(), this::getFullChunk, this.chunkMap.playerMobDistanceMap == null ? new LocalMobCapCalculator(this.chunkMap) : null, false);
++                    spawnCountsReady.set(true);
++                    // Leaves end - optimize mob spawning
+                 }
+-                spawnercreature_d = NaturalSpawner.createState(l, this.level.getAllEntities(), this::getFullChunk, null, true);
+-            } else {
+-                spawnercreature_d = NaturalSpawner.createState(l, this.level.getAllEntities(), this::getFullChunk, this.chunkMap.playerMobDistanceMap == null ? new LocalMobCapCalculator(this.chunkMap) : null, false);
+-            }
+             // Paper end
+             this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings
+ 
+-            this.lastSpawnState = spawnercreature_d;
++            // this.lastSpawnState = spawnercreature_d; // Leaves - optimize mob spawning
+             gameprofilerfiller.popPush("filteringLoadedChunks");
+             // Paper - moved down
+             this.level.timings.chunkTicks.startTiming(); // Paper
+@@ -612,9 +624,11 @@ public class ServerChunkCache extends ChunkSource {
+ 
+                 if ((true || this.level.isNaturalSpawningAllowed(chunkcoordintpair)) && this.chunkMap.anyPlayerCloseEnoughForSpawning(holder, chunkcoordintpair, false)) { // Paper - optimise anyPlayerCloseEnoughForSpawning // Paper - the chunk is known ticking
+                     chunk1.incrementInhabitedTime(j);
+-                    if (flag2 && (this.spawnEnemies || this.spawnFriendlies) && this.level.getWorldBorder().isWithinBounds(chunkcoordintpair) && this.chunkMap.anyPlayerCloseEnoughForSpawning(holder, chunkcoordintpair, true)) { // Spigot // Paper - optimise anyPlayerCloseEnoughForSpawning & optimise chunk tick iteration
+-                        NaturalSpawner.spawnForChunk(this.level, chunk1, spawnercreature_d, this.spawnFriendlies, this.spawnEnemies, flag1);
++                    // Leaves start - optimize mob spawning
++                    if (flag2 && (!top.leavesmc.leaves.LeavesConfig.asyncMobSpawning || spawnCountsReady.get()) && (this.spawnEnemies || this.spawnFriendlies) && this.level.getWorldBorder().isWithinBounds(chunkcoordintpair) && this.chunkMap.anyPlayerCloseEnoughForSpawning(holder, chunkcoordintpair, true)) { // Spigot // Paper - optimise anyPlayerCloseEnoughForSpawning & optimise chunk tick iteration
++                        NaturalSpawner.spawnForChunk(this.level, chunk1, lastSpawnState, this.spawnFriendlies, this.spawnEnemies, flag1);
+                     }
++                    // Leaves end - optimize mob spawning
+ 
+                     if (true || this.level.shouldTickBlocksAt(chunkcoordintpair.toLong())) { // Paper - the chunk is known ticking
+                         this.level.tickChunk(chunk1, k);
+@@ -674,6 +688,30 @@ public class ServerChunkCache extends ChunkSource {
+                 }
+             }
+             // Paper end - controlled flush for entity tracker packets
++
++            // Leaves start - optimize mob spawning
++            if (top.leavesmc.leaves.LeavesConfig.asyncMobSpawning) {
++                for (ServerPlayer player : this.level.players) {
++                    Arrays.fill(player.mobCounts, 0);
++                }
++                if (firstRunSpawnCounts) {
++                    firstRunSpawnCounts = false;
++                    spawnCountsReady.set(true);
++                }
++                if (chunkMap.playerMobDistanceMap != null && spawnCountsReady.getAndSet(false)) {
++                    net.minecraft.server.MinecraftServer.getServer().mobSpawnExecutor.submit(() -> {
++                        int mapped = distanceManager.getNaturalSpawnChunkCount();
++                        io.papermc.paper.util.maplist.IteratorSafeOrderedReferenceSet.Iterator<Entity> objectiterator =
++                            level.entityTickList.entities.iterator(io.papermc.paper.util.maplist.IteratorSafeOrderedReferenceSet.ITERATOR_FLAG_SEE_ADDITIONS);
++                        top.leavesmc.leaves.util.IterableWrapper<Entity> wrappedIterator =
++                            new top.leavesmc.leaves.util.IterableWrapper<Entity>(objectiterator);
++                        lastSpawnState = NaturalSpawner.createState(mapped, wrappedIterator, this::getFullChunk, null, true);
++                        objectiterator.finishedIterating();
++                        spawnCountsReady.set(true);
++                    });
++                }
++            }
++            // Leaves end - optimize mob spawning
+         }
      }
  
--    public static boolean asyncMobSpawning = false;
-+    public static boolean asyncMobSpawning = false; // void
-     private static boolean asyncMobSpawningLock = false;
-     private static void asyncMobSpawning() {
-         if (!asyncMobSpawningLock) {
+diff --git a/src/main/java/net/minecraft/world/level/entity/EntityTickList.java b/src/main/java/net/minecraft/world/level/entity/EntityTickList.java
+index 4cdfc433df67afcd455422e9baf56f167dd712ae..a6e0f5dab21d806e0c7744b2a337cded2739d870 100644
+--- a/src/main/java/net/minecraft/world/level/entity/EntityTickList.java
++++ b/src/main/java/net/minecraft/world/level/entity/EntityTickList.java
+@@ -8,7 +8,7 @@ import javax.annotation.Nullable;
+ import net.minecraft.world.entity.Entity;
+ 
+ public class EntityTickList {
+-    private final io.papermc.paper.util.maplist.IteratorSafeOrderedReferenceSet<Entity> entities = new io.papermc.paper.util.maplist.IteratorSafeOrderedReferenceSet<>(true); // Paper - rewrite this, always keep this updated - why would we EVER tick an entity that's not ticking?
++    public final io.papermc.paper.util.maplist.IteratorSafeOrderedReferenceSet<Entity> entities = new io.papermc.paper.util.maplist.IteratorSafeOrderedReferenceSet<>(true); // Paper - rewrite this, always keep this updated - why would we EVER tick an entity that's not ticking? // Leaves - private -> public
+ 
+     private void ensureActiveIsNotIterated() {
+         // Paper - replace with better logic, do not delay removals
diff --git a/patches/server/0019-Multithreaded-Tracker.patch b/patches/server/0019-Multithreaded-Tracker.patch
index 193fee4e..20abad90 100644
--- a/patches/server/0019-Multithreaded-Tracker.patch
+++ b/patches/server/0019-Multithreaded-Tracker.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Multithreaded Tracker
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index 7a3086850da4894002a22d80d7f7cb9a1534cd6b..65ba44b49ecc31b4c54092e8eaf8c6c2a94e93f7 100644
+index dd1c1c7abc5eb5ed9f32b321e4b971c730c8c556..615f45ab7521c821800b154464dac122e3f26ca4 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-@@ -257,7 +257,7 @@ public final class LeavesConfig {
+@@ -252,7 +252,7 @@ public final class LeavesConfig {
          dontSendUselessEntityPackets = getBoolean("settings.performance.dont-send-useless-entity-packets", dontSendUselessEntityPackets);
      }
  
diff --git a/patches/server/0026-Optimize-random-calls-in-chunk-ticking.patch b/patches/server/0026-Optimize-random-calls-in-chunk-ticking.patch
index dfaecf6d..309351f3 100644
--- a/patches/server/0026-Optimize-random-calls-in-chunk-ticking.patch
+++ b/patches/server/0026-Optimize-random-calls-in-chunk-ticking.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Optimize random calls in chunk ticking
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 488a253e218409b5f0b4a872cee0928578fa7582..a55ed382125310dfdfaeb7e80de2634a8d67f929 100644
+index edafe1f60aab84b9eda5c4b7462552a3b23e19ff..b3d60819cee789c4cb3f7dcd2a8ea4aeb0b50f27 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -553,6 +553,11 @@ public class ServerChunkCache extends ChunkSource {
+@@ -558,6 +558,11 @@ public class ServerChunkCache extends ChunkSource {
              ProfilerFiller gameprofilerfiller = this.level.getProfiler();
  
              gameprofilerfiller.push("pollingChunks");
diff --git a/patches/server/0030-Config-to-disable-method-profiler.patch b/patches/server/0030-Config-to-disable-method-profiler.patch
index 2b231c85..32a8d6b1 100644
--- a/patches/server/0030-Config-to-disable-method-profiler.patch
+++ b/patches/server/0030-Config-to-disable-method-profiler.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Config to disable method profiler
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 307d4fd4b52aa654f859aab34126048b6a127dde..755f0d3631b733799d2cb07a22b0bed8a7ab9e9d 100644
+index a1cf15fc45111508657efe3a4d7f48bfe27dcd9f..a93018a2797bc1a1c134f810eaa067d0a0b4bb8a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2277,6 +2277,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2279,6 +2279,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public ProfilerFiller getProfiler() {
diff --git a/patches/server/0037-Async-Pathfinding.patch b/patches/server/0037-Async-Pathfinding.patch
index 4badfb0b..6f145a9b 100644
--- a/patches/server/0037-Async-Pathfinding.patch
+++ b/patches/server/0037-Async-Pathfinding.patch
@@ -7,10 +7,10 @@ This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 But Pufferfish patch was ported downstream from the Petal fork
 
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index 65ba44b49ecc31b4c54092e8eaf8c6c2a94e93f7..abfda50759834375ef810ecf5b4124510e9bb197 100644
+index 615f45ab7521c821800b154464dac122e3f26ca4..c9ec0505c584d6e0a7ccd2b7286980b4fa157e2c 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-@@ -358,7 +358,7 @@ public final class LeavesConfig {
+@@ -353,7 +353,7 @@ public final class LeavesConfig {
      // only config now
      public static boolean asyncPathfinding = false;
      private static boolean asyncPathfindingLock = false;
diff --git a/patches/server/0044-BBOR-Protocol.patch b/patches/server/0044-BBOR-Protocol.patch
index 1c5dd354..41ae7546 100644
--- a/patches/server/0044-BBOR-Protocol.patch
+++ b/patches/server/0044-BBOR-Protocol.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] BBOR Protocol
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 755f0d3631b733799d2cb07a22b0bed8a7ab9e9d..e7f1e2440c067ebf8c1c2d175d413de6d27f5ff7 100644
+index a93018a2797bc1a1c134f810eaa067d0a0b4bb8a..41fcf8abe96be28cdc79eba6eebe753deb38de2f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1601,6 +1601,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1603,6 +1603,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          this.profiler.popPush("server gui refresh");
  
diff --git a/patches/server/0053-MC-Technical-Survival-Mode.patch b/patches/server/0053-MC-Technical-Survival-Mode.patch
index 53ba9577..3266c4a8 100644
--- a/patches/server/0053-MC-Technical-Survival-Mode.patch
+++ b/patches/server/0053-MC-Technical-Survival-Mode.patch
@@ -70,7 +70,7 @@ index e30d5ae3e2900f43d7cafde71b8196f26e872841..79bfd7b5da13197c2d3f7dbf9c3154dd
                  if (playerReputation != null) {
                      playerReputation.remove(GossipType.MAJOR_POSITIVE);
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index c767257b56acbe2cde391f405c010f5b2f62a17c..4327ec0948fb82939272f2dc1bbde8b1e090c5b7 100644
+index b0f23ebceb2f492b21eb95ee9496621f46c975c7..79f8e34032cde65a7d2a1f21bc32e0c22aff8efc 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -95,7 +95,7 @@ public final class NaturalSpawner {
@@ -83,7 +83,7 @@ index c767257b56acbe2cde391f405c010f5b2f62a17c..4327ec0948fb82939272f2dc1bbde8b1
                          entity.spawnReason == org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CHUNK_GEN)) {
                      continue;
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index abfda50759834375ef810ecf5b4124510e9bb197..92bcaef8959a1adc5eb6cff1fb4ff2ddefdc7105 100644
+index c9ec0505c584d6e0a7ccd2b7286980b4fa157e2c..eb6ad5d455d9038af539be2cd785e3fa274fc786 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 @@ -2,6 +2,7 @@ package top.leavesmc.leaves;
@@ -94,7 +94,7 @@ index abfda50759834375ef810ecf5b4124510e9bb197..92bcaef8959a1adc5eb6cff1fb4ff2dd
  import net.minecraft.server.MinecraftServer;
  import net.minecraft.world.level.block.Blocks;
  import net.minecraft.world.level.material.PushReaction;
-@@ -478,6 +479,13 @@ public final class LeavesConfig {
+@@ -473,6 +474,13 @@ public final class LeavesConfig {
  
      public static void doMcTechnicalMode() {
          if (mcTechnicalMode) {
diff --git a/patches/server/0055-Appleskin-Protocol.patch b/patches/server/0055-Appleskin-Protocol.patch
index 390f3e04..88e613cb 100644
--- a/patches/server/0055-Appleskin-Protocol.patch
+++ b/patches/server/0055-Appleskin-Protocol.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Appleskin Protocol
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e7f1e2440c067ebf8c1c2d175d413de6d27f5ff7..c358f6de2947e16da54acdc7809c70ffae331944 100644
+index 41fcf8abe96be28cdc79eba6eebe753deb38de2f..46eacd000b622b9dba746fe38e4bf2a0abfe061c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1602,6 +1602,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1604,6 +1604,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.profiler.popPush("server gui refresh");
  
          top.leavesmc.leaves.protocol.BBORProtocol.tick(); // Leaves - bbor
diff --git a/patches/server/0057-Leaves-Extra-Yggdrasil-Service.patch b/patches/server/0057-Leaves-Extra-Yggdrasil-Service.patch
index 00eb17dd..9a420836 100644
--- a/patches/server/0057-Leaves-Extra-Yggdrasil-Service.patch
+++ b/patches/server/0057-Leaves-Extra-Yggdrasil-Service.patch
@@ -31,7 +31,7 @@ index dae36c6452ccd57a436dd918547b64d59957ab0a..973ecf723e4239307600b42f2d12c264
              String s = (String) Optional.ofNullable((String) optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
              LevelStorageSource convertable = LevelStorageSource.createDefault(file.toPath());
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c358f6de2947e16da54acdc7809c70ffae331944..54265a48aab8dc74c34903e177f9e578f459b35a 100644
+index 46eacd000b622b9dba746fe38e4bf2a0abfe061c..3b42b63d0fefb4a978b372facd0a03b674625843 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -264,7 +264,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -44,7 +44,7 @@ index c358f6de2947e16da54acdc7809c70ffae331944..54265a48aab8dc74c34903e177f9e578
      public final Thread serverThread;
      private long nextTickTime;
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index 92bcaef8959a1adc5eb6cff1fb4ff2ddefdc7105..b7505187883a6292af8fc72dc01b702715d8409f 100644
+index eb6ad5d455d9038af539be2cd785e3fa274fc786..7e5785cccb9089c5b51a8cfbf03573df5f765d7e 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 @@ -13,6 +13,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
@@ -55,7 +55,7 @@ index 92bcaef8959a1adc5eb6cff1fb4ff2ddefdc7105..b7505187883a6292af8fc72dc01b7027
  import top.leavesmc.leaves.util.MathUtils;
  
  import java.io.File;
-@@ -514,6 +515,9 @@ public final class LeavesConfig {
+@@ -509,6 +510,9 @@ public final class LeavesConfig {
          extraYggdrasilLoginProtect = getBoolean("settings.misc.extra-yggdrasil-service.login-protect", extraYggdrasilLoginProtect);
          extraYggdrasilServiceList = getList("settings.misc.extra-yggdrasil-service.urls", extraYggdrasilServiceList);
          if (extraYggdrasilService) {
diff --git a/patches/server/0059-Fix-update-suppression-crash.patch b/patches/server/0059-Fix-update-suppression-crash.patch
index c96162af..1c98f1e3 100644
--- a/patches/server/0059-Fix-update-suppression-crash.patch
+++ b/patches/server/0059-Fix-update-suppression-crash.patch
@@ -20,10 +20,10 @@ index d2f0a0755317f5fa9a1ccf7db346aa77fd287d80..9c7fb1b7c2ff458e72bdcfa80c49252c
                          if (listener.shouldPropagateHandlingExceptions()) {
                              throw exception;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c358f6de2947e16da54acdc7809c70ffae331944..32c6d55851c1ef74476bfa570405e5205af21b35 100644
+index 3b42b63d0fefb4a978b372facd0a03b674625843..67653452bc4bd63eafe3a6f407653536e3360f33 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1559,7 +1559,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1561,7 +1561,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
              try {
                  worldserver.timings.doTick.startTiming(); // Spigot
diff --git a/patches/server/0060-Bedrock-break-list.patch b/patches/server/0060-Bedrock-break-list.patch
index 2fc7e472..909b8809 100644
--- a/patches/server/0060-Bedrock-break-list.patch
+++ b/patches/server/0060-Bedrock-break-list.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Bedrock break list
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 32c6d55851c1ef74476bfa570405e5205af21b35..b8fd91fc1ebaafad28cfa08d5af71aa3b1c54da4 100644
+index 67653452bc4bd63eafe3a6f407653536e3360f33..16fd5af5f0f5018f87bf143926b6ec6b4bfc1a76 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1609,6 +1609,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1611,6 +1611,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          top.leavesmc.leaves.protocol.BBORProtocol.tick(); // Leaves - bbor
          top.leavesmc.leaves.protocol.AppleSkinProtocol.tick(); // Leaves - appleskin
@@ -37,7 +37,7 @@ index 3a4a0727ad44322e3ba85512cd077808dab080b7..4a1a5f5c4672262875caa17bc7da8aa2
              this.stopTrackingObjective(objective);
          }
 diff --git a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
-index ee316f2474e43c1e644632772e9eb9cc181756c6..7931f202793e04dcde5a317f06b2a8c403240216 100644
+index 58d1f76544d7a8d196f75438579266664e5d7404..63b512283b2f5a96a78fe55d68e7373250367cdb 100644
 --- a/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/piston/PistonBaseBlock.java
 @@ -92,6 +92,11 @@ public class PistonBaseBlock extends DirectionalBlock {
diff --git a/patches/server/0061-Syncmatica-Protocol.patch b/patches/server/0061-Syncmatica-Protocol.patch
index d007165d..6f0f9845 100644
--- a/patches/server/0061-Syncmatica-Protocol.patch
+++ b/patches/server/0061-Syncmatica-Protocol.patch
@@ -54,7 +54,7 @@ index 066a044e721b82d908d22528141cdc504343e6b5..97d8c056bbb77d01b3d87f29fefd5fc1
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
                  this.disconnect("Invalid custom payload!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD);
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index b7505187883a6292af8fc72dc01b702715d8409f..4e5eb9df7f4b1379ea61491a9a8a48fd506daeb2 100644
+index 7e5785cccb9089c5b51a8cfbf03573df5f765d7e..39a858ebeed7192e0b6e8a48779c5257715f8864 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 @@ -14,6 +14,7 @@ import top.leavesmc.leaves.command.LeavesCommand;
@@ -65,7 +65,7 @@ index b7505187883a6292af8fc72dc01b702715d8409f..4e5eb9df7f4b1379ea61491a9a8a48fd
  import top.leavesmc.leaves.util.MathUtils;
  
  import java.io.File;
-@@ -552,6 +553,7 @@ public final class LeavesConfig {
+@@ -547,6 +548,7 @@ public final class LeavesConfig {
          syncmaticaQuota = getBoolean("settings.protocol.syncmatica.quota", syncmaticaQuota);
          syncmaticaQuotaLimit = getInt("settings.protocol.syncmatica.quota-limit", syncmaticaQuotaLimit);
          if (syncmaticaProtocol) {
diff --git a/patches/server/0071-Creative-fly-no-clip.patch b/patches/server/0071-Creative-fly-no-clip.patch
index 7a808ea4..c260355e 100644
--- a/patches/server/0071-Creative-fly-no-clip.patch
+++ b/patches/server/0071-Creative-fly-no-clip.patch
@@ -85,10 +85,10 @@ index d9baa85962236c42219cf09d4f3129be93ff069c..c1bd06fbc2c5683888f7264c35c25feb
  
      public boolean isSpawning() {
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index bdf4e0fc8c8efd61a44e31042b6117420f9b656f..4396849cfc3f75c320dfaea95843e75495dc3337 100644
+index 7a9af432124382efcf27f921cb6737ce2b072d18..e914c52d27cdcb2cc2c4b290fe0046417ff91c04 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-@@ -598,6 +598,7 @@ public final class LeavesConfig {
+@@ -593,6 +593,7 @@ public final class LeavesConfig {
      }
  
      public static void registerCarpetRules() {
diff --git a/patches/server/0078-Bladeren-mspt-sync-protocol.patch b/patches/server/0078-Bladeren-mspt-sync-protocol.patch
index b35ba149..e7932afc 100644
--- a/patches/server/0078-Bladeren-mspt-sync-protocol.patch
+++ b/patches/server/0078-Bladeren-mspt-sync-protocol.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Bladeren mspt sync protocol
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ac236dd4c288d21d4689d1e37eca5a5922cf95c2..9bd10bf6877852b684cb3dbfa1cc426aa4ab3df6 100644
+index 16fd5af5f0f5018f87bf143926b6ec6b4bfc1a76..87bb9de0403339d3f14fa9065d0a0515fad3e767 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1610,6 +1610,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1612,6 +1612,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          top.leavesmc.leaves.protocol.BBORProtocol.tick(); // Leaves - bbor
          top.leavesmc.leaves.protocol.AppleSkinProtocol.tick(); // Leaves - appleskin
          top.leavesmc.leaves.util.BreakBedrockList.endTick(); // Leaves - break bedrock list
diff --git a/patches/server/0109-Skip-unnecessary-mob-spawning-computations.patch b/patches/server/0109-Skip-unnecessary-mob-spawning-computations.patch
index 3fa7cd52..6f93b163 100644
--- a/patches/server/0109-Skip-unnecessary-mob-spawning-computations.patch
+++ b/patches/server/0109-Skip-unnecessary-mob-spawning-computations.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Skip unnecessary mob spawning computations
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index a55ed382125310dfdfaeb7e80de2634a8d67f929..a1046f68b078be2dc0e7fda129cc5beb81bd9e1f 100644
+index b3d60819cee789c4cb3f7dcd2a8ea4aeb0b50f27..32a7c67bed4878828cacac549e955d16cbe62ea2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -561,32 +561,39 @@ public class ServerChunkCache extends ChunkSource {
+@@ -566,15 +566,19 @@ public class ServerChunkCache extends ChunkSource {
              int k = this.level.getGameRules().getInt(GameRules.RULE_RANDOMTICKING);
              boolean flag1 = level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) != 0L && worlddata.getGameTime() % level.ticksPerSpawnCategory.getLong(org.bukkit.entity.SpawnCategory.ANIMAL) == 0L; // CraftBukkit
  
@@ -20,9 +20,6 @@ index a55ed382125310dfdfaeb7e80de2634a8d67f929..a1046f68b078be2dc0e7fda129cc5beb
 +            // Leaves start - skip unnecessary mob spawning computations
              NaturalSpawner.SpawnState spawnercreature_d; // moved down
 -            if ((this.spawnFriendlies || this.spawnEnemies) && this.chunkMap.playerMobDistanceMap != null) { // don't count mobs when animals and monsters are disabled
--                // re-set mob counts
--                for (ServerPlayer player : this.level.players) {
--                    Arrays.fill(player.mobCounts, 0);
 +            boolean flag2 = this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && !this.level.players().isEmpty(); // CraftBukkit
 +            boolean flag2AndHasNaturalSpawn = flag2 && this.anySpawnCategoryIsSpawnedThisTick();
 +            if (!top.leavesmc.leaves.LeavesConfig.skipUnnecessaryMobSpawningComputations || flag2AndHasNaturalSpawn) {
@@ -31,29 +28,29 @@ index a55ed382125310dfdfaeb7e80de2634a8d67f929..a1046f68b078be2dc0e7fda129cc5beb
 +                int l = this.distanceManager.getNaturalSpawnChunkCount();
 +                // Paper start - per player mob spawning
 +                if ((this.spawnFriendlies || this.spawnEnemies) && this.chunkMap.playerMobDistanceMap != null) { // don't count mobs when animals and monsters are disabled
-+                    // re-set mob counts
-+                    for (ServerPlayer player : this.level.players) {
-+                        Arrays.fill(player.mobCounts, 0);
-+                    }
-+                    spawnercreature_d = NaturalSpawner.createState(l, this.level.getAllEntities(), this::getFullChunk, null, true);
-+                } else {
-+                    spawnercreature_d = NaturalSpawner.createState(l, this.level.getAllEntities(), this::getFullChunk, this.chunkMap.playerMobDistanceMap == null ? new LocalMobCapCalculator(this.chunkMap) : null, false);
+                     // Leaves start - optimize mob spawning
+                     if (!top.leavesmc.leaves.LeavesConfig.asyncMobSpawning) {
+-                        // re-set mob counts
++                        //re-set mob counts
+                         for (ServerPlayer player : this.level.players) {
+                             Arrays.fill(player.mobCounts, 0);
+                         }
+@@ -587,18 +591,21 @@ public class ServerChunkCache extends ChunkSource {
+                     spawnCountsReady.set(true);
+                     // Leaves end - optimize mob spawning
                  }
--                spawnercreature_d = NaturalSpawner.createState(l, this.level.getAllEntities(), this::getFullChunk, null, true);
-+                // Paper end
-+                this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings
-+
-+                this.lastSpawnState = spawnercreature_d;
-+                gameprofilerfiller.popPush("filteringLoadedChunks");
-             } else {
--                spawnercreature_d = NaturalSpawner.createState(l, this.level.getAllEntities(), this::getFullChunk, this.chunkMap.playerMobDistanceMap == null ? new LocalMobCapCalculator(this.chunkMap) : null, false);
-+                spawnercreature_d = null;
-             }
 -            // Paper end
 -            this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings
--
--            this.lastSpawnState = spawnercreature_d;
++                // Paper end
++                this.level.timings.countNaturalMobs.stopTiming(); // Paper - timings
+ 
+-            // this.lastSpawnState = spawnercreature_d; // Leaves - optimize mob spawning
 -            gameprofilerfiller.popPush("filteringLoadedChunks");
++                // this.lastSpawnState = spawnercreature_d; // Leaves - optimize mob spawning
++                gameprofilerfiller.popPush("filteringLoadedChunks");
++            } else {
++                spawnercreature_d = null;
++            }
              // Paper - moved down
              this.level.timings.chunkTicks.startTiming(); // Paper
  
@@ -65,16 +62,16 @@ index a55ed382125310dfdfaeb7e80de2634a8d67f929..a1046f68b078be2dc0e7fda129cc5beb
  
              // Paper - only shuffle if per-player mob spawning is disabled
              // Paper - moved natural spawn event up
-@@ -617,7 +624,7 @@ public class ServerChunkCache extends ChunkSource {
- 
+@@ -630,7 +637,7 @@ public class ServerChunkCache extends ChunkSource {
                  if ((true || this.level.isNaturalSpawningAllowed(chunkcoordintpair)) && this.chunkMap.anyPlayerCloseEnoughForSpawning(holder, chunkcoordintpair, false)) { // Paper - optimise anyPlayerCloseEnoughForSpawning // Paper - the chunk is known ticking
                      chunk1.incrementInhabitedTime(j);
--                    if (flag2 && (this.spawnEnemies || this.spawnFriendlies) && this.level.getWorldBorder().isWithinBounds(chunkcoordintpair) && this.chunkMap.anyPlayerCloseEnoughForSpawning(holder, chunkcoordintpair, true)) { // Spigot // Paper - optimise anyPlayerCloseEnoughForSpawning & optimise chunk tick iteration
-+                    if ((top.leavesmc.leaves.LeavesConfig.skipUnnecessaryMobSpawningComputations ? flag2AndHasNaturalSpawn : flag2) && (this.spawnEnemies || this.spawnFriendlies) && this.level.getWorldBorder().isWithinBounds(chunkcoordintpair) && this.chunkMap.anyPlayerCloseEnoughForSpawning(holder, chunkcoordintpair, true)) { // Spigot // Paper - optimise anyPlayerCloseEnoughForSpawning & optimise chunk tick iteration // Leaves -skip unnecessary mob spawning computations
-                         NaturalSpawner.spawnForChunk(this.level, chunk1, spawnercreature_d, this.spawnFriendlies, this.spawnEnemies, flag1);
+                     // Leaves start - optimize mob spawning
+-                    if (flag2 && (!top.leavesmc.leaves.LeavesConfig.asyncMobSpawning || spawnCountsReady.get()) && (this.spawnEnemies || this.spawnFriendlies) && this.level.getWorldBorder().isWithinBounds(chunkcoordintpair) && this.chunkMap.anyPlayerCloseEnoughForSpawning(holder, chunkcoordintpair, true)) { // Spigot // Paper - optimise anyPlayerCloseEnoughForSpawning & optimise chunk tick iteration
++                    if ((top.leavesmc.leaves.LeavesConfig.skipUnnecessaryMobSpawningComputations ? flag2AndHasNaturalSpawn : flag2) && (!top.leavesmc.leaves.LeavesConfig.asyncMobSpawning || spawnCountsReady.get()) && (this.spawnEnemies || this.spawnFriendlies) && this.level.getWorldBorder().isWithinBounds(chunkcoordintpair) && this.chunkMap.anyPlayerCloseEnoughForSpawning(holder, chunkcoordintpair, true)) { // Spigot // Paper - optimise anyPlayerCloseEnoughForSpawning & optimise chunk tick iteration // Leaves -skip unnecessary mob spawning computations
+                         NaturalSpawner.spawnForChunk(this.level, chunk1, lastSpawnState, this.spawnFriendlies, this.spawnEnemies, flag1);
                      }
- 
-@@ -682,6 +689,18 @@ public class ServerChunkCache extends ChunkSource {
+                     // Leaves end - optimize mob spawning
+@@ -720,6 +727,18 @@ public class ServerChunkCache extends ChunkSource {
          }
      }
  
diff --git a/patches/server/0112-Avoid-anvil-too-expensive.patch b/patches/server/0112-Avoid-anvil-too-expensive.patch
index b5f24338..8904902e 100644
--- a/patches/server/0112-Avoid-anvil-too-expensive.patch
+++ b/patches/server/0112-Avoid-anvil-too-expensive.patch
@@ -18,10 +18,10 @@ index e0c3a4ba27e21c3692e601acd0af60873bcbb84c..b9fcf49ed88c62265d9aa8926c1228b9
              }
  
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-index 92f86949338b78def78e2c755827d7f044c30192..60eaf8ec26b21b23c447bb722f0a58b7269f2027 100644
+index 2fb4dd030863790122d6681ef9a7cacea4873915..337c9851d22aa45d2f68d770ea8850e81b86f9fd 100644
 --- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-@@ -604,6 +604,7 @@ public final class LeavesConfig {
+@@ -599,6 +599,7 @@ public final class LeavesConfig {
  
      public static void registerCarpetRules() {
          CarpetRules.register(CarpetRule.of("carpet", "creativeNoClip", creativeNoClip));