From 31990e0284ab6c28a637f2ceebd2736cd5cd2992 Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Tue, 26 Sep 2023 00:49:19 -0400
Subject: [PATCH] Fix Optimize mob spawning temporarily

---
 ...005-Pufferfish-Optimize-mob-spawning.patch | 18 ++--------
 .../server/0009-Purpur-Server-Changes.patch   | 34 +++++++++----------
 patches/server/0010-Remove-Timings.patch      | 30 ++++++++--------
 ...-Purpur-Configurable-server-mod-name.patch |  4 +--
 .../0027-Leaves-Appleskin-Protocol.patch      |  4 +--
 patches/server/0033-Fix-tracker-NPE.patch     |  4 +--
 6 files changed, 41 insertions(+), 53 deletions(-)

diff --git a/patches/server/0005-Pufferfish-Optimize-mob-spawning.patch b/patches/server/0005-Pufferfish-Optimize-mob-spawning.patch
index 780d41ea..17a34a43 100644
--- a/patches/server/0005-Pufferfish-Optimize-mob-spawning.patch
+++ b/patches/server/0005-Pufferfish-Optimize-mob-spawning.patch
@@ -20,14 +20,15 @@ and, in my opinion, worth the low risk of minor mob-spawning-related
 inconsistencies.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 889886a949df9eb49a26c6fec9a32ddfbf938847..3c8c30829298adc1eb1b1b34160480dcbbb446b6 100644
+index 889886a949df9eb49a26c6fec9a32ddfbf938847..a8535f791188b2d8ba8d663372e688a1bfebe3c0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -295,6 +295,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -295,6 +295,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public static final long SERVER_INIT = System.nanoTime();
      // Paper end - lag compensation
  
 +    public gg.pufferfish.pufferfish.util.AsyncExecutor mobSpawnExecutor = new gg.pufferfish.pufferfish.util.AsyncExecutor("MobSpawning"); // Pufferfish - 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
@@ -43,19 +44,6 @@ index f74efb12626a3f027d716bcd3bdb69d9225b3fac..6ae953902a9ed246246660c8da7654c7
              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 1d6b75467166def7f0573f5cabe19aafb18de3c7..e7ba192bd8493e273afb36f8c7da374147c337cd 100644
---- a/src/main/java/net/minecraft/server/level/ChunkMap.java
-+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -206,7 +206,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-     // Paper end
-     // Paper start - optimise chunk tick iteration
-     public final it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet<ChunkHolder> needsChangeBroadcasting = new it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet<>();
--    public final com.destroystokyo.paper.util.misc.PlayerAreaMap playerMobSpawnMap = new com.destroystokyo.paper.util.misc.PlayerAreaMap(this.pooledLinkedPlayerHashSets);
-+    public final com.destroystokyo.paper.util.misc.PlayerAreaMap playerMobSpawnMap = org.dreeam.leaf.LeafConfig.enableAsyncMobSpawning ? new gg.pufferfish.pufferfish.util.AsyncPlayerAreaMap(this.pooledLinkedPlayerHashSets) : new com.destroystokyo.paper.util.misc.PlayerAreaMap(this.pooledLinkedPlayerHashSets); // Pufferfish
-     // Paper end - optimise chunk tick iteration
- 
-     public ChunkMap(ServerLevel world, LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, StructureTemplateManager structureTemplateManager, Executor executor, BlockableEventLoop<Runnable> mainThreadExecutor, LightChunkGetter chunkProvider, ChunkGenerator chunkGenerator, ChunkProgressListener worldGenerationProgressListener, ChunkStatusUpdateListener chunkStatusChangeListener, Supplier<DimensionDataStorage> persistentStateManagerFactory, int viewDistance, boolean dsync) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 index 18e521e77e58a9f786937192249c884aa317988c..f5584de85ca4b95be9b107df562ebf3963ad1b5a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
diff --git a/patches/server/0009-Purpur-Server-Changes.patch b/patches/server/0009-Purpur-Server-Changes.patch
index 278ba744..cf78f971 100644
--- a/patches/server/0009-Purpur-Server-Changes.patch
+++ b/patches/server/0009-Purpur-Server-Changes.patch
@@ -700,7 +700,7 @@ index 9ec6145fe04ec64bbee8ec6a837719caebdbc6f5..358d610ad020cada1bb83e393deeeaae
      public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) {
          this.gameTime = time;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3c8c30829298adc1eb1b1b34160480dcbbb446b6..b22ac919761c54b5f466bd35740710445ce3dd8f 100644
+index a8535f791188b2d8ba8d663372e688a1bfebe3c0..995dd071082e482785448678b9189f0715a75308 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -273,6 +273,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -726,7 +726,7 @@ index 3c8c30829298adc1eb1b1b34160480dcbbb446b6..b22ac919761c54b5f466bd3574071044
  
      public volatile Thread shutdownThread; // Paper
      public volatile boolean abnormalExit = false; // Paper
-@@ -914,6 +917,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -915,6 +918,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          MinecraftServer.LOGGER.info("Stopping server");
          Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Shutdown and don't bother finishing
          MinecraftTimings.stopServer(); // Paper
@@ -742,7 +742,7 @@ index 3c8c30829298adc1eb1b1b34160480dcbbb446b6..b22ac919761c54b5f466bd3574071044
          // CraftBukkit start
          if (this.server != null) {
              this.server.disablePlugins();
-@@ -994,6 +1006,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -995,6 +1007,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.safeShutdown(waitForShutdown, false);
      }
      public void safeShutdown(boolean waitForShutdown, boolean isRestarting) {
@@ -751,7 +751,7 @@ index 3c8c30829298adc1eb1b1b34160480dcbbb446b6..b22ac919761c54b5f466bd3574071044
          this.isRestarting = isRestarting;
          this.hasLoggedStop = true; // Paper
          if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper
-@@ -1131,10 +1145,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1132,10 +1146,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      tps5.add(currentTps, diff);
                      tps15.add(currentTps, diff);
                      // Backwards compat with bad plugins
@@ -769,7 +769,7 @@ index 3c8c30829298adc1eb1b1b34160480dcbbb446b6..b22ac919761c54b5f466bd3574071044
                      tickSection = curTime;
                  }
                  // Spigot end
-@@ -1146,7 +1164,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1147,7 +1165,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  this.tickServer(this::haveTime);
                  lastTickProperTime = (System.nanoTime() - tickProperStart) / 1000000L; // Gale - YAPFA - last tick time
                  this.mayHaveDelayedTasks = true;
@@ -784,7 +784,7 @@ index 3c8c30829298adc1eb1b1b34160480dcbbb446b6..b22ac919761c54b5f466bd3574071044
                  this.waitUntilNextTick();
                  this.isReady = true;
                  JvmProfiler.INSTANCE.onServerTick(this.averageTickTime);
-@@ -1491,7 +1515,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1492,7 +1516,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              long worldTime = level.getGameTime();
              final ClientboundSetTimePacket worldPacket = new ClientboundSetTimePacket(worldTime, dayTime, doDaylight);
              for (Player entityhuman : level.players()) {
@@ -793,7 +793,7 @@ index 3c8c30829298adc1eb1b1b34160480dcbbb446b6..b22ac919761c54b5f466bd3574071044
                      continue;
                  }
                  ServerPlayer entityplayer = (ServerPlayer) entityhuman;
-@@ -1505,6 +1529,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1506,6 +1530,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          MinecraftTimings.timeUpdateTimer.stopTiming(); // Spigot // Paper
  
          this.isIteratingOverLevels = true; // Paper
@@ -801,7 +801,7 @@ index 3c8c30829298adc1eb1b1b34160480dcbbb446b6..b22ac919761c54b5f466bd3574071044
          Iterator iterator = this.getAllLevels().iterator(); // Paper - move down
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
-@@ -1512,6 +1537,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1513,6 +1538,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
              net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper
              worldserver.hasEntityMoveEvent =  io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
@@ -809,7 +809,7 @@ index 3c8c30829298adc1eb1b1b34160480dcbbb446b6..b22ac919761c54b5f466bd3574071044
  
              /* Drop global time updates
              if (this.tickCount % 20 == 0) {
-@@ -2541,6 +2567,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2542,6 +2568,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              new com.google.common.util.concurrent.ThreadFactoryBuilder().setDaemon(true).setNameFormat("Async Chat Thread - #%d").setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(net.minecraft.server.MinecraftServer.LOGGER)).build()); // Paper
  
      public ChatDecorator getChatDecorator() {
@@ -3890,7 +3890,7 @@ index 09bc539502dada5dfdd95e50141e587c1c3dee4c..bac374f348363cd0f8b981dc444d419b
              if (baseEntity == null) {
                  if (this.isCombat && (!targetEntity.canBeSeenAsEnemy() || targetEntity.level().getDifficulty() == Difficulty.PEACEFUL)) {
 diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-index ba809ea753df1f1c347d0410c4ff255ce6a55532..cf5ecd9247cb01a829fde97a81ee5fb5dc36609d 100644
+index ba809ea753df1f1c347d0410c4ff255ce6a55532..53e2dc684099c9593bdb764bad11f24934c13ca7 100644
 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 @@ -18,6 +18,7 @@ import net.minecraft.world.entity.EntityDimensions;
@@ -8717,7 +8717,7 @@ index 4ce3e69970dd9eb251d0538a2d233ca30e9e5e47..afc65b8bb7e7f7f70a25f2d869412ed3
 +    // Purpur end - Shears can defuse TNT
  }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-index b319021b22c5dceba6199ed27814b2dcf47b8d50..28eb98d383d6846a25c29f8cd8ff211c360a56dc 100644
+index b319021b22c5dceba6199ed27814b2dcf47b8d50..8d53b54f11bd79855121a7c3f6ba2b810086b6ef 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
 @@ -66,16 +66,19 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
@@ -8777,8 +8777,8 @@ index b319021b22c5dceba6199ed27814b2dcf47b8d50..28eb98d383d6846a25c29f8cd8ff211c
 +        // Purpur start - implemented in LivingEntity
          super.aiStep();
      }
-
-@@ -205,7 +182,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
+ 
+@@ -205,7 +187,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
          double d2 = target.getZ() - this.getZ();
          double d3 = Math.sqrt(d0 * d0 + d2 * d2);
  
@@ -8787,7 +8787,7 @@ index b319021b22c5dceba6199ed27814b2dcf47b8d50..28eb98d383d6846a25c29f8cd8ff211c
          // CraftBukkit start
          org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getMainHandItem(), entityarrow.getPickupItem(), entityarrow, net.minecraft.world.InteractionHand.MAIN_HAND, 0.8F, true); // Paper
          if (event.isCancelled()) {
-@@ -236,7 +213,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
+@@ -236,7 +218,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
          this.reassessWeaponGoal();
          // Paper start
          if (nbt.contains("Paper.ShouldBurnInDay")) {
@@ -8796,7 +8796,7 @@ index b319021b22c5dceba6199ed27814b2dcf47b8d50..28eb98d383d6846a25c29f8cd8ff211c
          }
          // Paper end
      }
-@@ -245,7 +222,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
+@@ -245,7 +227,7 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
      @Override
      public void addAdditionalSaveData(CompoundTag nbt) {
          super.addAdditionalSaveData(nbt);
@@ -11776,7 +11776,7 @@ index 3e79562f51efbac51785fa0998d6a1a6e3036939..4f242ba9131f341606af13ac543af8a0
          this.updateActivity();
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 1ddbba72a5fd3d225b651815a38d178941fba289..97ed65885f43c712953d6d8b3c231bac6f031390 100644
+index 1ddbba72a5fd3d225b651815a38d178941fba289..929cbdb6cc7b40329fe65705aecf4f36b1c40a48 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -96,22 +96,69 @@ public class Zombie extends Monster {
@@ -11964,7 +11964,7 @@ index 1ddbba72a5fd3d225b651815a38d178941fba289..97ed65885f43c712953d6d8b3c231bac
                      }
                  }
              }
-@@ -596,7 +631,7 @@ public class Zombie extends Monster {
+@@ -596,7 +635,7 @@ public class Zombie extends Monster {
      }
  
      protected void randomizeReinforcementsChance() {
diff --git a/patches/server/0010-Remove-Timings.patch b/patches/server/0010-Remove-Timings.patch
index 9670f008..1402d1e0 100644
--- a/patches/server/0010-Remove-Timings.patch
+++ b/patches/server/0010-Remove-Timings.patch
@@ -958,7 +958,7 @@ index 9a49f5271ec1d9de17632bfffe8309cb1ba0d8b1..1bf374d482acba25614ae303d1fa72ed
                      } catch (Exception exception) {
                          if (exception instanceof ReportedException) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b22ac919761c54b5f466bd35740710445ce3dd8f..07ea151777da3c233177642c56fb47adfe3feac1 100644
+index 995dd071082e482785448678b9189f0715a75308..233325eab66a856eaa56abc3f0cc8af84d29f25d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -179,8 +179,6 @@ import org.bukkit.craftbukkit.Main;
@@ -970,7 +970,7 @@ index b22ac919761c54b5f466bd35740710445ce3dd8f..07ea151777da3c233177642c56fb47ad
  public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements ServerInfo, CommandSource, AutoCloseable {
  
      public static final int SERVER_THREAD_PRIORITY = Integer.getInteger("gale.thread.priority.server", -1); // Gale - server thread priority environment variable
-@@ -916,7 +914,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -917,7 +915,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          MinecraftServer.LOGGER.info("Stopping server");
          Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Shutdown and don't bother finishing
@@ -978,7 +978,7 @@ index b22ac919761c54b5f466bd35740710445ce3dd8f..07ea151777da3c233177642c56fb47ad
          // Purpur start
          if (upnp) {
              if (dev.omega24.upnp4j.UPnP4J.close(this.getPort(), dev.omega24.upnp4j.util.Protocol.TCP)) {
-@@ -1280,7 +1277,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1281,7 +1278,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      protected void waitUntilNextTick() {
@@ -987,7 +987,7 @@ index b22ac919761c54b5f466bd35740710445ce3dd8f..07ea151777da3c233177642c56fb47ad
          long tickOversleepStart = System.nanoTime(); // Gale - YAPFA - last tick time
          this.managedBlock(() -> {
              return !this.canSleepForTickNoOversleep(); // Paper - move oversleep into full server tick
-@@ -1376,15 +1373,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1377,15 +1374,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public void onServerExit() {}
  
      public void tickServer(BooleanSupplier shouldKeepTicking) {
@@ -1005,7 +1005,7 @@ index b22ac919761c54b5f466bd35740710445ce3dd8f..07ea151777da3c233177642c56fb47ad
          // Paper end
          new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.tickCount+1).callEvent(); // Paper
  
-@@ -1416,11 +1412,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1417,11 +1413,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
          // Paper end
          io.papermc.paper.util.CachedLists.reset(); // Paper
@@ -1017,7 +1017,7 @@ index b22ac919761c54b5f466bd35740710445ce3dd8f..07ea151777da3c233177642c56fb47ad
          // Paper start
          long endTime = System.nanoTime();
          long remaining = (TICK_TIME - (endTime - lastTick)) - catchupTime;
-@@ -1438,7 +1429,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1439,7 +1430,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Paper end
          this.logTickTime(k - i);
          org.spigotmc.WatchdogThread.tick(); // Spigot
@@ -1025,7 +1025,7 @@ index b22ac919761c54b5f466bd35740710445ce3dd8f..07ea151777da3c233177642c56fb47ad
      }
  
      protected void logTickTime(long nanos) {}
-@@ -1475,9 +1465,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1476,9 +1466,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.getPlayerList().getPlayers().forEach((entityplayer) -> {
              entityplayer.connection.suspendFlushing();
          });
@@ -1035,7 +1035,7 @@ index b22ac919761c54b5f466bd35740710445ce3dd8f..07ea151777da3c233177642c56fb47ad
          // Paper start - Folia scheduler API
          ((io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler) Bukkit.getGlobalRegionScheduler()).tick();
          getAllLevels().forEach(level -> {
-@@ -1493,20 +1481,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1494,20 +1482,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          });
          // Paper end - Folia scheduler API
          io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.CALLBACK_MANAGER.handleQueue(this.tickCount); // Paper
@@ -1056,7 +1056,7 @@ index b22ac919761c54b5f466bd35740710445ce3dd8f..07ea151777da3c233177642c56fb47ad
          // Send time updates to everyone, it will get the right time from the world the player is in.
          // Paper start - optimize time updates
          for (final ServerLevel level : this.getAllLevels()) {
-@@ -1526,7 +1509,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1527,7 +1510,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              }
          }
          // Paper end
@@ -1064,7 +1064,7 @@ index b22ac919761c54b5f466bd35740710445ce3dd8f..07ea151777da3c233177642c56fb47ad
  
          this.isIteratingOverLevels = true; // Paper
          net.minecraft.network.FriendlyByteBuf.hasItemSerializeEvent = org.purpurmc.purpur.event.packet.NetworkItemSerializeEvent.getHandlerList().getRegisteredListeners().length > 0; // Purpur
-@@ -1546,14 +1528,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1547,14 +1529,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              // CraftBukkit end */
  
              try {
@@ -1079,7 +1079,7 @@ index b22ac919761c54b5f466bd35740710445ce3dd8f..07ea151777da3c233177642c56fb47ad
              } catch (Throwable throwable) {
                  // Spigot Start
                  CrashReport crashreport;
-@@ -1573,21 +1553,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1574,21 +1554,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
          this.isIteratingOverLevels = false; // Paper
  
@@ -1101,7 +1101,7 @@ index b22ac919761c54b5f466bd35740710445ce3dd8f..07ea151777da3c233177642c56fb47ad
  
          iterator = this.playerList.getPlayers().iterator();
  
-@@ -1597,7 +1571,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1598,7 +1572,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              entityplayer.connection.chunkSender.sendNextChunks(entityplayer);
              entityplayer.connection.resumeFlushing();
          }
@@ -1109,7 +1109,7 @@ index b22ac919761c54b5f466bd35740710445ce3dd8f..07ea151777da3c233177642c56fb47ad
      }
  
      private void synchronizeTime(ServerLevel world) {
-@@ -2663,8 +2636,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2664,8 +2637,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              return;
          }
  
@@ -1118,7 +1118,7 @@ index b22ac919761c54b5f466bd35740710445ce3dd8f..07ea151777da3c233177642c56fb47ad
              for (;;) {
                  boolean moreTasks = this.tickMidTickTasks();
                  long currTime = System.nanoTime();
-@@ -2689,9 +2660,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2690,9 +2661,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      return;
                  }
              }
@@ -1195,7 +1195,7 @@ index 7b703cd286b3819eb67b6ee95605d95ef9c44af4..2d9bf21bc0e947d221ab237da24d7305
          // Paper start
          if (waitableArray[0] != null) {
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index e7ba192bd8493e273afb36f8c7da374147c337cd..f86a41811e588b3b34a5c7d227ab384d07d62ff7 100644
+index 1d6b75467166def7f0573f5cabe19aafb18de3c7..727a5120f16c30a0393b25a762f031eb40dd69b4 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -1,6 +1,5 @@
diff --git a/patches/server/0011-Purpur-Configurable-server-mod-name.patch b/patches/server/0011-Purpur-Configurable-server-mod-name.patch
index 47e177f7..7db0283a 100644
--- a/patches/server/0011-Purpur-Configurable-server-mod-name.patch
+++ b/patches/server/0011-Purpur-Configurable-server-mod-name.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur: Configurable server mod name
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 07ea151777da3c233177642c56fb47adfe3feac1..e3f3c08084cae954670c056c1141250899f79123 100644
+index 233325eab66a856eaa56abc3f0cc8af84d29f25d..b54a764c2a24f8e09792ade7a9a4ebb17d9d4e7b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1661,7 +1661,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1662,7 +1662,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
diff --git a/patches/server/0027-Leaves-Appleskin-Protocol.patch b/patches/server/0027-Leaves-Appleskin-Protocol.patch
index 3a61e371..81a91c64 100644
--- a/patches/server/0027-Leaves-Appleskin-Protocol.patch
+++ b/patches/server/0027-Leaves-Appleskin-Protocol.patch
@@ -7,10 +7,10 @@ Original license: GPLv3
 Original project: https://github.com/LeavesMC/Leaves
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e3f3c08084cae954670c056c1141250899f79123..64b2c6773dfa7a0b5db2e22fafa7c0bd8a86ea94 100644
+index b54a764c2a24f8e09792ade7a9a4ebb17d9d4e7b..e4455fcee23ea7511fdacd3ef9c6dd2353fc6191 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1559,6 +1559,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1560,6 +1560,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              GameTestTicker.SINGLETON.tick();
          }
  
diff --git a/patches/server/0033-Fix-tracker-NPE.patch b/patches/server/0033-Fix-tracker-NPE.patch
index 3d1744b4..db19b401 100644
--- a/patches/server/0033-Fix-tracker-NPE.patch
+++ b/patches/server/0033-Fix-tracker-NPE.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix tracker NPE
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index f86a41811e588b3b34a5c7d227ab384d07d62ff7..4644f8464ae0f623e0a618ebe8987c1945279ac8 100644
+index 727a5120f16c30a0393b25a762f031eb40dd69b4..0380672e1ba184720acb35a630722bc6b02994df 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -204,7 +204,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -14,7 +14,7 @@ index f86a41811e588b3b34a5c7d227ab384d07d62ff7..4644f8464ae0f623e0a618ebe8987c19
      // Paper start - optimise chunk tick iteration
 -    public final it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet<ChunkHolder> needsChangeBroadcasting = new it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet<>();
 +    public final Set<ChunkHolder> needsChangeBroadcasting = Sets.newConcurrentHashSet(); // Leaf
-     public final com.destroystokyo.paper.util.misc.PlayerAreaMap playerMobSpawnMap = org.dreeam.leaf.LeafConfig.enableAsyncMobSpawning ? new gg.pufferfish.pufferfish.util.AsyncPlayerAreaMap(this.pooledLinkedPlayerHashSets) : new com.destroystokyo.paper.util.misc.PlayerAreaMap(this.pooledLinkedPlayerHashSets); // Pufferfish
+     public final com.destroystokyo.paper.util.misc.PlayerAreaMap playerMobSpawnMap = new com.destroystokyo.paper.util.misc.PlayerAreaMap(this.pooledLinkedPlayerHashSets);
      // Paper end - optimise chunk tick iteration
  
 @@ -1212,7 +1212,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider