Remove Timings

patches/api/0001-Leaf-config-files.patch

@@ -5,12 +5,12 @@ Subject: [PATCH] Leaf config files
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index bd93eb61669a014054cb1ba71f99d74ba8463622..c55819f56b4a3850496feef6900c1ec8a0bb1a9d 100644
+index 9ff34994f2a4dcf0b10262aacc912d7d283c121e..a5938b0a960121bd77a13e4c8fc8a053bea481c5 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2186,6 +2186,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-         }
-         // Purpur end
+@@ -2174,6 +2174,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+ 
+         // Paper end
  
 +        // Leaf start
 +        @NotNull

patches/api/0003-Purpur-API-Changes.patch

@@ -439,12 +439,12 @@ index bce07d84cafca677bb6fad78c21b82097f06430c..4ef0fa4f1ef72bb784674671473c6a32
 +    // Purpur end - OfflinePlayer API
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 9ff34994f2a4dcf0b10262aacc912d7d283c121e..bd93eb61669a014054cb1ba71f99d74ba8463622 100644
+index a5938b0a960121bd77a13e4c8fc8a053bea481c5..43a57c9e32e5a51140e784a4a5a44c0b0b752133 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2174,6 +2174,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
- 
-         // Paper end
+@@ -2182,6 +2182,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+         }
+         // Leaf end
  
 +        // Purpur start
 +        @NotNull
@@ -461,7 +461,7 @@ index 9ff34994f2a4dcf0b10262aacc912d7d283c121e..bd93eb61669a014054cb1ba71f99d74b
          /**
           * Sends the component to the player
           *
-@@ -2483,4 +2495,111 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2491,4 +2503,111 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      long getLastTickOversleepTime();
      // Gale end - YAPFA - last tick time - API
  

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 3328eb0715dab1786a677029bf6356d9118059b9..d9d92e74b101b2a4276b419ad9dcbdc361cb6860 100644
+index d6f41a95d1fe6891cbfdb6e3c7fc7872e2effbbb..bae93e3bbe3067250f08b4c8fad160f9bdf6f6d3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1683,7 +1683,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1657,7 +1657,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {

patches/server/0013-Remove-Mojang-username-check.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Remove Mojang username check
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
-index 2163d62be320031b6cd1bed06a2600801c634112..fe5ee9f6ee14e74679b9f26fae3412b04a431c75 100644
+index badb262810effd22ca1ba021a1e746a777a19cbc..9baf55e9c3259aed431022a50c12d4f215c3ed80 100644
 --- a/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerLoginPacketListenerImpl.java
 @@ -253,10 +253,10 @@ public class ServerLoginPacketListenerImpl implements ServerLoginPacketListener,

patches/server/0015-Remove-UseItemOnPacket-Too-Far-Check.patch

@@ -7,7 +7,7 @@ This Check is added in 1.17.x -> 1.18.x update by Mojang.
 By removing this check, it enable hackers to use some modules of hack clients.
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index b959abd801fa2d0646375a388f1d9053fff88f29..823ad91c82d96477655d9f895483a3dd07f30e84 100644
+index 40f32af1976323fd5ffe9aef0725025284daffb3..97958536a31f4a5f3b1935f5afeb9c81ecfa458b 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2101,7 +2101,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

patches/server/0016-KTP-Optimize-spigot-event-bus.patch

@@ -12,10 +12,10 @@ events to be published by the server without impacting the overall
 performance too much.
 
 diff --git a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
-index 7ce9ebba8ce304d1f3f21d4f15ee5f3560d7700b..760535e1d6335cf07b6222525610a11318d2596f 100644
+index a1c9726d25479b5326fe2fa2b0f5a98d6b2da4c5..06dfd0b27ac0006a2be07f54a0702519a691c6ec 100644
 --- a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
 +++ b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
-@@ -36,11 +36,17 @@ class PaperEventManager {
+@@ -35,11 +35,17 @@ class PaperEventManager {
  
      // SimplePluginManager
      public void callEvent(@NotNull Event event) {

patches/server/0019-KeYi-Add-an-option-for-spigot-item-merging-mechanism.patch

@@ -7,7 +7,7 @@ Original license: MIT
 Original project: https://github.com/KeYiMC/KeYi
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 30295f15b7f7f95058878231529102f91203ba58..e038813da06c3e22266f3607bb107fda6e220499 100644
+index 3ff5c2a4a2cca5c9a89ceafd9fddeb1012344433..90ab4610026b23ac84e6c941c6581d13fe3565a2 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -331,7 +331,7 @@ public class ItemEntity extends Entity implements TraceableEntity {

patches/server/0023-Slice-Smooth-Teleports.patch

@@ -19,10 +19,10 @@ index 54807be5d539fd768f9cb7a8ce912983ae328b46..26f904d5c63bd25d7aac3ab667ec4590
      private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
      public io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 3f60073c5ced65abf67f6fe175f9032c7bf49cfa..ba45ab1a76c9f98b134d0bd9798fa9a9830dbdac 100644
+index e3d1e030063a8746dbdaea14c6de7d900bc1ad0f..ec1dd7c0046ac9091d5b6b2cd703237883b3841f 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -953,12 +953,12 @@ public abstract class PlayerList {
+@@ -952,12 +952,12 @@ public abstract class PlayerList {
          int i = flag ? 1 : 0;
          // CraftBukkit start
          LevelData worlddata = worldserver1.getLevelData();

patches/server/0026-Leaves-Jade-Protocol.patch

@@ -9,7 +9,7 @@ Original project: https://github.com/LeavesMC/Leaves
 This patch is Powered by Jade(https://github.com/Snownee/Jade)
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 823ad91c82d96477655d9f895483a3dd07f30e84..577bcfdb715c116146c6e182073864b71b693385 100644
+index 97958536a31f4a5f3b1935f5afeb9c81ecfa458b..223bb1f3e48cc073ef239a154966cab4e0b71059 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -250,6 +250,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -20,7 +20,7 @@ index 823ad91c82d96477655d9f895483a3dd07f30e84..577bcfdb715c116146c6e182073864b7
  // CraftBukkit end
  
  public class ServerGamePacketListenerImpl implements ServerPlayerConnection, TickablePacketListener, ServerGamePacketListener {
-@@ -3775,6 +3776,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3771,6 +3772,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
                  }
                  // Paper end
                  this.cserver.getMessenger().dispatchIncomingMessage(this.player.getBukkitEntity(), packet.identifier.toString(), data);
@@ -31,10 +31,10 @@ index 823ad91c82d96477655d9f895483a3dd07f30e84..577bcfdb715c116146c6e182073864b7
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex);
                  this.disconnect("Invalid custom payload!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ba45ab1a76c9f98b134d0bd9798fa9a9830dbdac..848baa457daaf3ffbbcad46b1a7fe69eae347fea 100644
+index ec1dd7c0046ac9091d5b6b2cd703237883b3841f..ffc24a510d5557a31e9bea7bd51ee9ccb58ba633 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -358,6 +358,8 @@ public abstract class PlayerList {
+@@ -357,6 +357,8 @@ public abstract class PlayerList {
  
          player.didPlayerJoinEvent = true; // Gale - EMC - do not process chat/commands before player has joined
  
@@ -57,10 +57,10 @@ index e91b4d63d42276f8a498cab7c439c785730f3f6f..a2d7c5008c6d6716d9530e00de0db027
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 40ce72ac4ca4f262ad77cf5ba47b8f2c8d9055d2..de1d2c270dc454b959694af03bb85b6e6616e336 100644
+index b656114a0c2594c553e60b8a923a8a99c3b682c2..9de1ba2ae71c65ad3262d445a89c1620d84d860c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -484,6 +484,7 @@ public final class CraftServer implements Server {
+@@ -483,6 +483,7 @@ public final class CraftServer implements Server {
              MapPalette.setMapColorCache(new CraftMapColorCache(this.logger));
          }
          datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper
@@ -68,7 +68,7 @@ index 40ce72ac4ca4f262ad77cf5ba47b8f2c8d9055d2..de1d2c270dc454b959694af03bb85b6e
      }
  
      public boolean getCommandBlockOverride(String command) {
-@@ -1077,6 +1078,11 @@ public final class CraftServer implements Server {
+@@ -1076,6 +1077,11 @@ public final class CraftServer implements Server {
          this.console.paperConfigurations.reloadConfigs(this.console);
          this.console.galeConfigurations.reloadConfigs(this.console); // Gale - Gale configuration
          org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur

patches/server/0027-Leaves-Appleskin-Protocol.patch

@@ -7,23 +7,22 @@ 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 d9d92e74b101b2a4276b419ad9dcbdc361cb6860..312ba9705533f5790a95ed484d32ca46e9377887 100644
+index bae93e3bbe3067250f08b4c8fad160f9bdf6f6d3..b007d9fb7beb350424c14d5b1ac05050e9d92cef 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1591,6 +1591,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1567,6 +1567,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              GameTestTicker.SINGLETON.tick();
          }
  
 +        top.leavesmc.leaves.protocol.AppleSkinProtocol.tick(); // Leaves - appleskin
-+
-         MinecraftTimings.tickablesTimer.startTiming(); // Spigot // Paper
          for (int i = 0; i < this.tickables.size(); ++i) {
              ((Runnable) this.tickables.get(i)).run();
+         }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 848baa457daaf3ffbbcad46b1a7fe69eae347fea..0928c96afd0c4eb7ab14705e7e4d5ac9f16f35c7 100644
+index ffc24a510d5557a31e9bea7bd51ee9ccb58ba633..7637dbf519568693fd1b707490d4cd8a2776c3a7 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -359,6 +359,7 @@ public abstract class PlayerList {
+@@ -358,6 +358,7 @@ public abstract class PlayerList {
          player.didPlayerJoinEvent = true; // Gale - EMC - do not process chat/commands before player has joined
  
          top.leavesmc.leaves.protocol.JadeProtocol.onPlayerJoin(player); // Leaves - Jade
@@ -31,7 +30,7 @@ index 848baa457daaf3ffbbcad46b1a7fe69eae347fea..0928c96afd0c4eb7ab14705e7e4d5ac9
  
          final net.kyori.adventure.text.Component jm = playerJoinEvent.joinMessage();
  
-@@ -617,6 +618,7 @@ public abstract class PlayerList {
+@@ -616,6 +617,7 @@ public abstract class PlayerList {
          return this.remove(entityplayer, net.kyori.adventure.text.Component.translatable("multiplayer.player.left", net.kyori.adventure.text.format.NamedTextColor.YELLOW, io.papermc.paper.configuration.GlobalConfiguration.get().messages.useDisplayNameInQuitMessage ? entityplayer.getBukkitEntity().displayName() : PaperAdventure.asAdventure(entityplayer.getDisplayName())));
      }
      public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) {
@@ -40,10 +39,10 @@ index 848baa457daaf3ffbbcad46b1a7fe69eae347fea..0928c96afd0c4eb7ab14705e7e4d5ac9
          org.purpurmc.purpur.task.BossBarTask.removeFromAll(entityplayer.getBukkitEntity()); // Purpur
          ServerLevel worldserver = entityplayer.serverLevel();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index de1d2c270dc454b959694af03bb85b6e6616e336..804a784cae66cdc876b94c94373478438d75fd5b 100644
+index 9de1ba2ae71c65ad3262d445a89c1620d84d860c..f1210c93e4ca84ae45bf006ebcb37852a91e0352 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1083,6 +1083,13 @@ public final class CraftServer implements Server {
+@@ -1082,6 +1082,13 @@ public final class CraftServer implements Server {
              top.leavesmc.leaves.protocol.JadeProtocol.enableAllPlayer();
          }
          // Leaves end - Jade

patches/server/0028-Leaves-Xaero-Map-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/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0928c96afd0c4eb7ab14705e7e4d5ac9f16f35c7..cb77f0cb7628ecf75c42707a19bb2fc9d7395b53 100644
+index 7637dbf519568693fd1b707490d4cd8a2776c3a7..605da20aa58e5fbe9b306078c458d93223f616c5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1364,6 +1364,7 @@ public abstract class PlayerList {
+@@ -1361,6 +1361,7 @@ public abstract class PlayerList {
          player.connection.send(new ClientboundInitializeBorderPacket(worldborder));
          player.connection.send(new ClientboundSetTimePacket(world.getGameTime(), world.getDayTime(), world.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)));
          player.connection.send(new ClientboundSetDefaultSpawnPositionPacket(world.getSharedSpawnPos(), world.getSharedSpawnAngle()));

patches/server/0034-Fix-tracker-NPE.patch

@@ -5,10 +5,10 @@ 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 f192057ee342b9f09cc4ead1e605e1677b944ecd..1beec3d5b9c00c025cb65d8c79f5d0284cb964ca 100644
+index fd26d043747a9937078a25307248b7e8be017809..98bc16336ac3d308df82ffc474b55b5d4785fc29 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -115,8 +115,6 @@ import org.bukkit.craftbukkit.generator.CustomChunkGenerator;
+@@ -114,8 +114,6 @@ import org.bukkit.craftbukkit.generator.CustomChunkGenerator;
  import org.bukkit.entity.Player;
  // CraftBukkit end
  
@@ -17,7 +17,7 @@ index f192057ee342b9f09cc4ead1e605e1677b944ecd..1beec3d5b9c00c025cb65d8c79f5d028
  public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider {
  
      private static final byte CHUNK_TYPE_REPLACEABLE = -1;
-@@ -154,7 +152,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -153,7 +151,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
      private final Queue<Runnable> unloadQueue;
      int viewDistance;
      public final com.destroystokyo.paper.util.misc.PlayerAreaMap playerMobDistanceMap; // Paper
@@ -26,7 +26,7 @@ index f192057ee342b9f09cc4ead1e605e1677b944ecd..1beec3d5b9c00c025cb65d8c79f5d028
  
      // Paper - rewrite chunk system
      // Paper start - optimise checkDespawn
-@@ -1444,7 +1442,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1424,7 +1422,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          final Entity entity;
          private final int range;
          SectionPos lastSectionPos;
@@ -36,7 +36,7 @@ index f192057ee342b9f09cc4ead1e605e1677b944ecd..1beec3d5b9c00c025cb65d8c79f5d028
          public TrackedEntity(Entity entity, int i, int j, boolean flag) {
              this.serverEntity = new ServerEntity(ChunkMap.this.level, entity, j, flag, this::broadcast, this.seenBy); // CraftBukkit
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index cb7f88e37b6bd3a0a78f80ef6062e65818ab180c..fd047a0d3eabf9c57583d5780194fe57b2ab7394 100644
+index 30b243ca777a5b362b50dd4ad1ea22545c038162..10a1c2ccf7cf74dc052eb9a8abf41225a69d5bc0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -10,6 +10,7 @@ import java.util.Arrays;
@@ -55,9 +55,9 @@ index cb7f88e37b6bd3a0a78f80ef6062e65818ab180c..fd047a0d3eabf9c57583d5780194fe57
  
  public class ServerChunkCache extends ChunkSource {
  
-@@ -652,7 +652,7 @@ public class ServerChunkCache extends ChunkSource {
+@@ -631,7 +631,7 @@ public class ServerChunkCache extends ChunkSource {
+             }
              // Paper start - use set of chunks requiring updates, rather than iterating every single one loaded
-             this.level.timings.broadcastChunkUpdates.startTiming(); // Paper - timing
              if (!this.chunkMap.needsChangeBroadcasting.isEmpty()) {
 -                ReferenceOpenHashSet<ChunkHolder> copy = this.chunkMap.needsChangeBroadcasting.clone();
 +                List<ChunkHolder> copy = new ArrayList<>(this.chunkMap.needsChangeBroadcasting); // Leaf

patches/server/0036-Reduce-canSee-work.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Reduce canSee work
 Credit by: Martijn Muijsers <martijnmuijsers@live.nl>, MachineBreaker<machinebreaker>
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index a3ce11801710a1f87afeab5eafcced8ca98d2b31..98db0ab64f4d3ce89462c0038d52c781cf70cfad 100644
+index 7f7d5b9ac42bd510e29834d1df7f49d5659fbfa2..97c7e9c8dc2dc3860de4e697ecd2c1179ef6fd56 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -444,11 +444,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -442,11 +442,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          for (int i = 0, len = entities.size(); i < len; ++i) {
              Entity entity = entities.get(i);
  
@@ -22,7 +22,7 @@ index a3ce11801710a1f87afeab5eafcced8ca98d2b31..98db0ab64f4d3ce89462c0038d52c781
              // !entity1.dead && entity1.i && (entity == null || !entity1.x(entity));
              // elide the last check since vanilla calls with entity = null
              // only we care about the source for the canSee check
-@@ -456,6 +452,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -454,6 +450,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  continue;
              }
  

patches/server/0037-Faster-Natural-Spawning.patch

@@ -22,7 +22,7 @@ index ff1ad1024419182f7f3de578442c1c033d4c9ebb..5e51a1c79811291a740ad4d5e79a7d67
      @Deprecated
      static RandomSource createThreadSafe() {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 98db0ab64f4d3ce89462c0038d52c781cf70cfad..f3224f9393cb644ed6504fe9d8854979597368f8 100644
+index 97c7e9c8dc2dc3860de4e697ecd2c1179ef6fd56..4a6528cbc2810032cce96bf7228e9075def0c18d 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -125,6 +125,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -34,10 +34,10 @@ index 98db0ab64f4d3ce89462c0038d52c781cf70cfad..f3224f9393cb644ed6504fe9d8854979
      @Deprecated
      private final RandomSource threadSafeRandom = RandomSource.createThreadSafe();
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index cc41a921d3d3b07267317ac75f7aba33c39562a4..b61a36b478aea2de53e1fb1f00f34662511a87a1 100644
+index 8126bd60d5075e344df77add0a38f73c53b3bdd1..6fb5da6f8def49c80a56b4ad583bf54801cd378d 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-@@ -432,11 +432,13 @@ public final class NaturalSpawner {
+@@ -429,11 +429,13 @@ public final class NaturalSpawner {
      private static BlockPos getRandomPosWithin(ServerLevel world, LevelChunk chunk) { // Gale - Airplane - Use ThreadUnsafeRandom for mob spawning - accept ServerLevel
          ChunkPos chunkcoordintpair = chunk.getPos();
          // Gale start - Airplane - Use ThreadUnsafeRandom for mob spawning - use ThreadUnsafeRandom