diff --git a/patches/server/0017-Remove-vanilla-profiler.patch b/patches/server/0017-Remove-vanilla-profiler.patch
index 666f304..acd6992 100644
--- a/patches/server/0017-Remove-vanilla-profiler.patch
+++ b/patches/server/0017-Remove-vanilla-profiler.patch
@@ -73,16 +73,16 @@ index 80c2c8d565f03ae0ea24fbdecdbe2bc5b9aa4b82..3396c696a380f8ac64740acee887de82
  
          return b0;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9ebdc32891ff243e8e7c2ff9308a8a0e329f343b..ae74867e5ca1a77c99d6d2e39e916a6c3cf4f866 100644
+index 9ebdc32891ff243e8e7c2ff9308a8a0e329f343b..963e6ea64aeaa8cb453d99c56654df265fb2d343 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -107,18 +107,8 @@ import net.minecraft.util.ProgressListener;
+@@ -107,18 +107,9 @@ import net.minecraft.util.ProgressListener;
  import net.minecraft.util.RandomSource;
  import net.minecraft.util.SignatureValidator;
  import net.minecraft.util.datafix.DataFixers;
 -import net.minecraft.util.profiling.EmptyProfileResults;
 -import net.minecraft.util.profiling.ProfileResults;
--import net.minecraft.util.profiling.ProfilerFiller;
+ import net.minecraft.util.profiling.ProfilerFiller;
 -import net.minecraft.util.profiling.ResultField;
 -import net.minecraft.util.profiling.SingleTickProfiler;
  import net.minecraft.util.profiling.jfr.JvmProfiler;
@@ -95,7 +95,7 @@ index 9ebdc32891ff243e8e7c2ff9308a8a0e329f343b..ae74867e5ca1a77c99d6d2e39e916a6c
  import net.minecraft.util.thread.ReentrantBlockableEventLoop;
  import net.minecraft.world.Difficulty;
  import net.minecraft.world.RandomSequences;
-@@ -216,14 +206,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -216,14 +207,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public LevelStorageSource.LevelStorageAccess storageSource;
      public final PlayerDataStorage playerDataStorage;
      private final List<Runnable> tickables = Lists.newArrayList();
@@ -110,7 +110,7 @@ index 9ebdc32891ff243e8e7c2ff9308a8a0e329f343b..ae74867e5ca1a77c99d6d2e39e916a6c
      private ServerConnectionListener connection;
      public final ChunkProgressListenerFactory progressListenerFactory;
      @Nullable
-@@ -335,13 +317,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -335,13 +318,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public MinecraftServer(OptionSet options, WorldLoader.DataLoadContext worldLoader, Thread thread, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PackRepository resourcepackrepository, WorldStem worldstem, Proxy proxy, DataFixer datafixer, Services services, ChunkProgressListenerFactory worldloadlistenerfactory) {
          super("Server");
          SERVER = this; // Paper - better singleton
@@ -124,7 +124,7 @@ index 9ebdc32891ff243e8e7c2ff9308a8a0e329f343b..ae74867e5ca1a77c99d6d2e39e916a6c
          this.random = RandomSource.create();
          this.port = -1;
          this.levels = Maps.newLinkedHashMap();
-@@ -937,9 +912,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -937,9 +913,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
          // Paper end
          // CraftBukkit end
@@ -134,7 +134,7 @@ index 9ebdc32891ff243e8e7c2ff9308a8a0e329f343b..ae74867e5ca1a77c99d6d2e39e916a6c
  
          MinecraftServer.LOGGER.info("Stopping server");
          Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Shutdown and don't bother finishing
-@@ -1164,23 +1136,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1164,23 +1137,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  }
                  // Spigot end
  
@@ -158,7 +158,7 @@ index 9ebdc32891ff243e8e7c2ff9308a8a0e329f343b..ae74867e5ca1a77c99d6d2e39e916a6c
                  this.isReady = true;
                  JvmProfiler.INSTANCE.onServerTick(this.averageTickTime);
              }
-@@ -1341,7 +1303,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1341,7 +1304,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void doRunTask(TickTask ticktask) { // CraftBukkit - decompile error
@@ -166,7 +166,7 @@ index 9ebdc32891ff243e8e7c2ff9308a8a0e329f343b..ae74867e5ca1a77c99d6d2e39e916a6c
          super.doRunTask(ticktask);
      }
  
-@@ -1408,7 +1369,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1408,7 +1370,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (playerSaveInterval < 0) {
              playerSaveInterval = autosavePeriod;
          }
@@ -174,7 +174,7 @@ index 9ebdc32891ff243e8e7c2ff9308a8a0e329f343b..ae74867e5ca1a77c99d6d2e39e916a6c
          final boolean fullSave = autosavePeriod > 0 && this.tickCount % autosavePeriod == 0;
          try {
              this.isSaving = true;
-@@ -1423,7 +1383,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1423,7 +1384,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          } finally {
              this.isSaving = false;
          }
@@ -182,7 +182,7 @@ index 9ebdc32891ff243e8e7c2ff9308a8a0e329f343b..ae74867e5ca1a77c99d6d2e39e916a6c
          // Paper end
          io.papermc.paper.util.CachedLists.reset(); // Paper
          // Paper start - move executeAll() into full server tick timing
-@@ -1436,7 +1395,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1436,7 +1396,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          long remaining = (TICK_TIME - (endTime - lastTick)) - catchupTime;
          new com.destroystokyo.paper.event.server.ServerTickEndEvent(this.tickCount, ((double)(endTime - lastTick) / 1000000D), remaining).callEvent();
          // Paper end
@@ -190,7 +190,7 @@ index 9ebdc32891ff243e8e7c2ff9308a8a0e329f343b..ae74867e5ca1a77c99d6d2e39e916a6c
          long j = this.tickTimes[this.tickCount % 100] = Util.getNanos() - i;
  
          this.averageTickTime = this.averageTickTime * 0.8F + (float) j / 1000000.0F * 0.19999999F;
-@@ -1448,7 +1406,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1448,7 +1407,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          tickTimes60s.add(this.tickCount, j);
          // Paper end
          this.frameTimer.logFrameDuration(k - i);
@@ -198,7 +198,7 @@ index 9ebdc32891ff243e8e7c2ff9308a8a0e329f343b..ae74867e5ca1a77c99d6d2e39e916a6c
          org.spigotmc.WatchdogThread.tick(); // Spigot
          co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTimingFullServerTick(); // Paper // Gale - final timings calls
      }
-@@ -1500,11 +1457,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1500,11 +1458,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          });
          // Paper end - Folia scheduler API
          io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.CALLBACK_MANAGER.handleQueue(this.tickCount); // Paper
@@ -210,7 +210,7 @@ index 9ebdc32891ff243e8e7c2ff9308a8a0e329f343b..ae74867e5ca1a77c99d6d2e39e916a6c
          //Iterator iterator = this.getAllLevels().iterator(); // Paper - moved down
  
          // CraftBukkit start
-@@ -1545,19 +1500,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1545,19 +1501,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              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
  
@@ -230,7 +230,7 @@ index 9ebdc32891ff243e8e7c2ff9308a8a0e329f343b..ae74867e5ca1a77c99d6d2e39e916a6c
              try {
                  worldserver.timings.doTick.startTiming(); // Spigot
                  worldserver.tick(shouldKeepTicking);
-@@ -1582,17 +1530,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1582,17 +1531,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  throw new ReportedException(crashreport);
              }
  
@@ -248,7 +248,7 @@ index 9ebdc32891ff243e8e7c2ff9308a8a0e329f343b..ae74867e5ca1a77c99d6d2e39e916a6c
          MinecraftTimings.playerListTimer.startTiming(); // Spigot // Paper
          this.playerList.tick();
          MinecraftTimings.playerListTimer.stopTiming(); // Spigot // Paper
-@@ -1600,15 +1544,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1600,15 +1545,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              GameTestTicker.SINGLETON.tick();
          }
  
@@ -264,7 +264,7 @@ index 9ebdc32891ff243e8e7c2ff9308a8a0e329f343b..ae74867e5ca1a77c99d6d2e39e916a6c
      }
  
      private void synchronizeTime(ServerLevel world) {
-@@ -1616,7 +1556,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1616,7 +1557,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void forceTimeSynchronization() {
@@ -272,7 +272,7 @@ index 9ebdc32891ff243e8e7c2ff9308a8a0e329f343b..ae74867e5ca1a77c99d6d2e39e916a6c
          Iterator iterator = this.getAllLevels().iterator();
  
          while (iterator.hasNext()) {
-@@ -1624,8 +1563,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1624,8 +1564,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
              this.synchronizeTime(worldserver);
          }
@@ -281,18 +281,16 @@ index 9ebdc32891ff243e8e7c2ff9308a8a0e329f343b..ae74867e5ca1a77c99d6d2e39e916a6c
      }
  
      public boolean isNetherEnabled() {
-@@ -2277,10 +2214,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         return this.frameTimer;
+@@ -2278,7 +2216,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
--    public ProfilerFiller getProfiler() {
+     public ProfilerFiller getProfiler() {
 -        return this.profiler;
--    }
--
-     public abstract boolean isSingleplayerOwner(GameProfile profile);
++        return net.minecraft.util.profiling.InactiveProfiler.INSTANCE; // Gale - Purpur - remove vanilla profiler
+     }
  
-     public void dumpServerProperties(Path file) throws IOException {}
-@@ -2516,53 +2449,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     public abstract boolean isSingleplayerOwner(GameProfile profile);
+@@ -2516,53 +2454,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
      // CraftBukkit end
  
@@ -346,7 +344,7 @@ index 9ebdc32891ff243e8e7c2ff9308a8a0e329f343b..ae74867e5ca1a77c99d6d2e39e916a6c
      public Path getWorldPath(LevelResource worldSavePath) {
          return this.storageSource.getLevelPath(worldSavePath);
      }
-@@ -2608,25 +2494,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2608,25 +2499,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return this.isSaving;
      }
  
@@ -372,7 +370,7 @@ index 9ebdc32891ff243e8e7c2ff9308a8a0e329f343b..ae74867e5ca1a77c99d6d2e39e916a6c
      public int getMaxChainedNeighborUpdates() {
          return 1000000;
      }
-@@ -2665,56 +2532,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2665,56 +2537,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
      }
  
@@ -1609,18 +1607,10 @@ index 8f97c9df726ac20cfce7bdddd5dd4f8c5aa76c35..8f2c0dcb0ca69ea1b09bb055c6a94949
              }
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index f95aa6362605c10145a212ed4b7df42ad443f4cf..e87f593bc61fd60812ea60c597644cd02fc7f7f0 100644
+index f95aa6362605c10145a212ed4b7df42ad443f4cf..baf53980acfe52ec23b7f2f2183c2287c7b15d74 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -35,7 +35,6 @@ import net.minecraft.sounds.SoundSource;
- import net.minecraft.util.AbortableIterationConsumer;
- import net.minecraft.util.Mth;
- import net.minecraft.util.RandomSource;
--import net.minecraft.util.profiling.ProfilerFiller;
- import net.minecraft.world.DifficultyInstance;
- import net.minecraft.world.damagesource.DamageSource;
- import net.minecraft.world.damagesource.DamageSources;
-@@ -129,7 +128,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -129,7 +129,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      private final ResourceKey<DimensionType> dimensionTypeId;
      private final Holder<DimensionType> dimensionTypeRegistration;
      public final WritableLevelData levelData;
@@ -1628,7 +1618,7 @@ index f95aa6362605c10145a212ed4b7df42ad443f4cf..e87f593bc61fd60812ea60c597644cd0
      public final boolean isClientSide;
      private final WorldBorder worldBorder;
      private final BiomeManager biomeManager;
-@@ -271,7 +269,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -271,7 +270,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      public abstract ResourceKey<LevelStem> getTypeKey();
  
@@ -1637,7 +1627,7 @@ index f95aa6362605c10145a212ed4b7df42ad443f4cf..e87f593bc61fd60812ea60c597644cd0
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
          this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper
          this.galeConfig = galeWorldConfigCreator.apply(this.spigotConfig); // Gale - Gale configuration
-@@ -286,7 +284,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -286,7 +285,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          }
  
          // CraftBukkit end
@@ -1645,7 +1635,7 @@ index f95aa6362605c10145a212ed4b7df42ad443f4cf..e87f593bc61fd60812ea60c597644cd0
          this.levelData = worlddatamutable;
          this.dimensionTypeRegistration = holder;
          this.dimensionTypeId = (ResourceKey) holder.unwrapKey().orElseThrow(() -> {
-@@ -863,9 +860,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -863,9 +861,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      protected void tickBlockEntities() {
@@ -1655,7 +1645,7 @@ index f95aa6362605c10145a212ed4b7df42ad443f4cf..e87f593bc61fd60812ea60c597644cd0
          timings.tileEntityPending.startTiming(); // Spigot
          this.tickingBlockEntities = true;
          if (!this.pendingBlockEntityTickers.isEmpty()) {
-@@ -910,7 +904,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -910,7 +905,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          timings.tileEntityTick.stopTiming(); // Spigot
          this.tickingBlockEntities = false;
          co.aikar.timings.TimingHistory.tileEntityTicks += this.blockEntityTickers.size(); // Paper
@@ -1663,7 +1653,7 @@ index f95aa6362605c10145a212ed4b7df42ad443f4cf..e87f593bc61fd60812ea60c597644cd0
          spigotConfig.currentPrimedTnt = 0; // Spigot
      }
  
-@@ -1103,7 +1096,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1103,7 +1097,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      @Override
      public List<Entity> getEntities(@Nullable Entity except, AABB box, Predicate<? super Entity> predicate) {
@@ -1671,7 +1661,7 @@ index f95aa6362605c10145a212ed4b7df42ad443f4cf..e87f593bc61fd60812ea60c597644cd0
          List<Entity> list = Lists.newArrayList();
          ((ServerLevel)this).getEntityLookup().getEntities(except, box, list, predicate); // Paper - optimise this call
          return list;
-@@ -1122,7 +1114,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1122,7 +1115,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
      public <T extends Entity> void getEntities(EntityTypeTest<Entity, T> filter, AABB box, Predicate<? super T> predicate, List<? super T> result, int limit) {
@@ -1679,21 +1669,20 @@ index f95aa6362605c10145a212ed4b7df42ad443f4cf..e87f593bc61fd60812ea60c597644cd0
          // Paper start - optimise this call
          //TODO use limit
          if (filter instanceof net.minecraft.world.entity.EntityType entityTypeTest) {
-@@ -1378,14 +1369,6 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-         return false;
+@@ -1379,11 +1371,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      }
  
--    public ProfilerFiller getProfiler() {
+     public ProfilerFiller getProfiler() {
 -        return (ProfilerFiller) this.profiler.get();
--    }
--
--    public Supplier<ProfilerFiller> getProfilerSupplier() {
++        return net.minecraft.util.profiling.InactiveProfiler.INSTANCE; // Gale - Purpur - remove vanilla profiler
+     }
+ 
+     public Supplier<ProfilerFiller> getProfilerSupplier() {
 -        return this.profiler;
--    }
--
++        return () -> net.minecraft.util.profiling.InactiveProfiler.INSTANCE; // Gale - Purpur - remove vanilla profiler
+     }
+ 
      @Override
-     public BiomeManager getBiomeManager() {
-         return this.biomeManager;
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 index 089dd93d4cd4c1f72e63c4944b3b82c1e2ba732d..599efa2ed24e0d4944324c86ca23c38d8b111277 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
diff --git a/patches/server/0018-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0018-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
index 65725e3..a750fb7 100644
--- a/patches/server/0018-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/server/0018-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
@@ -74,10 +74,10 @@ index 0e8746759752b692668886370181aa5db1fd0bb0..e5e50817c83b6a7d3daf90960ed40218
      default BlockHitResult clip(ClipContext raytrace1, BlockPos blockposition) {
              // Paper start - Prevent raytrace from loading chunks
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 65258190f550a0a2653fc975430d8d88ff5ec259..0502f5bf4ee886ddc16f430a4c6679279cc12ff1 100644
+index baf53980acfe52ec23b7f2f2183c2287c7b15d74..96921ace1ecc5472794df9bf4fa5fd73e9779f5c 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -408,6 +408,91 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -409,6 +409,91 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          return null;
      }
  
diff --git a/patches/server/0022-Move-random-tick-random.patch b/patches/server/0022-Move-random-tick-random.patch
index a43557b..2724ab1 100644
--- a/patches/server/0022-Move-random-tick-random.patch
+++ b/patches/server/0022-Move-random-tick-random.patch
@@ -31,10 +31,10 @@ index 287f6a38a6f042983c5e652ff9800fb215a91221..47acb63bfca2f722a595cf6614c28e75
  
      public void tickChunk(LevelChunk chunk, int randomTickSpeed) {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 0502f5bf4ee886ddc16f430a4c6679279cc12ff1..5185af09005fd9f671daca0844b42e85b29a0376 100644
+index 96921ace1ecc5472794df9bf4fa5fd73e9779f5c..cb32c25a95fb16f02d84371d4bd0e4bc2755cb79 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -180,6 +180,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -181,6 +181,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public final Map<Explosion.CacheKey, Float> explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions
      public java.util.ArrayDeque<net.minecraft.world.level.block.RedstoneTorchBlock.Toggle> redstoneUpdateInfos; // Paper - Move from Map in BlockRedstoneTorch to here
  
diff --git a/patches/server/0036-Inline-level-height.patch b/patches/server/0036-Inline-level-height.patch
index 08d62ca..1af9ce4 100644
--- a/patches/server/0036-Inline-level-height.patch
+++ b/patches/server/0036-Inline-level-height.patch
@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 5185af09005fd9f671daca0844b42e85b29a0376..dd5d28339d28f344c2e68b43782545e6378117ca 100644
+index cb32c25a95fb16f02d84371d4bd0e4bc2755cb79..7ef39a42040d84264a059e32b1d853083ece7b32 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -271,6 +271,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -272,6 +272,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
  
      public abstract ResourceKey<LevelStem> getTypeKey();
  
@@ -50,7 +50,7 @@ index 5185af09005fd9f671daca0844b42e85b29a0376..dd5d28339d28f344c2e68b43782545e6
      protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, RegistryAccess iregistrycustom, Holder<DimensionType> holder, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.function.Function<org.spigotmc.SpigotWorldConfig, GaleWorldConfiguration> galeWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor // Gale - Gale configuration // Gale - Purpur - remove vanilla profiler
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
          this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper
-@@ -293,6 +302,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -294,6 +303,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          });
          final DimensionType dimensionmanager = (DimensionType) holder.value();
  
diff --git a/patches/server/0042-Remove-lambda-from-ticking-guard.patch b/patches/server/0042-Remove-lambda-from-ticking-guard.patch
index dad5862..78aacfa 100644
--- a/patches/server/0042-Remove-lambda-from-ticking-guard.patch
+++ b/patches/server/0042-Remove-lambda-from-ticking-guard.patch
@@ -57,10 +57,10 @@ index b7318670e039e05a058e437e025519d40557bb88..efbc8483a51c5272ca81747c82dc65e7
                      }
                  }
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 88de79c989320e5f54e1a380e8178085684202de..2968e5fb171fe7ee17afcd2590a1cb26ac287ea2 100644
+index 7ef39a42040d84264a059e32b1d853083ece7b32..db481e39fca1d6fd6dcd0c076f413b0f191fb0b3 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
-@@ -1014,13 +1014,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1015,13 +1015,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          try {
              tickConsumer.accept(entity);
              MinecraftServer.getServer().executeMidTickTasks(); // Paper - execute chunk tasks mid tick
diff --git a/patches/server/0079-Reduce-array-allocations.patch b/patches/server/0079-Reduce-array-allocations.patch
index 8c04583..682c970 100644
--- a/patches/server/0079-Reduce-array-allocations.patch
+++ b/patches/server/0079-Reduce-array-allocations.patch
@@ -412,7 +412,7 @@ index dae36c6452ccd57a436dd918547b64d59957ab0a..f06cafd80d7c027ca97e50bcb45ad520
          OptionSpec<Integer> optionspec11 = optionparser.accepts("port").withRequiredArg().ofType(Integer.class).defaultsTo(-1, new Integer[0]);
          OptionSpec<String> optionspec12 = optionparser.accepts("serverId").withRequiredArg();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ae74867e5ca1a77c99d6d2e39e916a6c3cf4f866..151b354d6b9613a2715bf618ff6bff4331006093 100644
+index 963e6ea64aeaa8cb453d99c56654df265fb2d343..9c99883afefe882f5669c4317e6d07a10713e617 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -50,6 +50,8 @@ import java.util.stream.Collectors;
@@ -798,7 +798,7 @@ index 2bfbdaeb2b0d99dfd956cd5936403fe8b0eeae64..84f1c4c3ded4f201899f3c74e639349b
      public Enchantments() {}
  
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 2968e5fb171fe7ee17afcd2590a1cb26ac287ea2..5efa854354796ff3b045947e1a430ef633b29b63 100644
+index db481e39fca1d6fd6dcd0c076f413b0f191fb0b3..8e84db48bb2658ce9d24c31f413aa23924839731 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -12,6 +12,8 @@ import java.util.function.Consumer;
@@ -810,7 +810,7 @@ index 2968e5fb171fe7ee17afcd2590a1cb26ac287ea2..5efa854354796ff3b045947e1a430ef6
  import net.minecraft.CrashReport;
  import net.minecraft.CrashReportCategory;
  import net.minecraft.core.BlockPos;
-@@ -1509,7 +1511,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -1518,7 +1520,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
      public org.bukkit.entity.Entity[] getChunkEntities(int chunkX, int chunkZ) {
          io.papermc.paper.world.ChunkEntitySlices slices = ((ServerLevel)this).getEntityLookup().getChunk(chunkX, chunkZ);
          if (slices == null) {
diff --git a/patches/server/0126-5-second-TPS-average.patch b/patches/server/0126-5-second-TPS-average.patch
index c712d14..8e999cd 100644
--- a/patches/server/0126-5-second-TPS-average.patch
+++ b/patches/server/0126-5-second-TPS-average.patch
@@ -59,10 +59,10 @@ index fa56cd09102a89692b42f1d14257990508c5c720..fac07dda413002c12276131efbe4ee38
          setListData(vector);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 151b354d6b9613a2715bf618ff6bff4331006093..1b081bf1407d98a4cc664adc4633533a414447d0 100644
+index 9c99883afefe882f5669c4317e6d07a10713e617..ba5ca4f0cb3385911c51cd42c682d3125652880a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1026,6 +1026,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1027,6 +1027,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
      private long lastTick = 0;
      private long catchupTime = 0;
@@ -70,7 +70,7 @@ index 151b354d6b9613a2715bf618ff6bff4331006093..1b081bf1407d98a4cc664adc4633533a
      public final RollingAverage tps1 = new RollingAverage(60);
      public final RollingAverage tps5 = new RollingAverage(60 * 5);
      public final RollingAverage tps15 = new RollingAverage(60 * 15);
-@@ -1126,6 +1127,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1127,6 +1128,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  {
                      final long diff = curTime - tickSection;
                      java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);
diff --git a/patches/server/0127-Measure-last-tick-time.patch b/patches/server/0127-Measure-last-tick-time.patch
index fd32b5d..00d6687 100644
--- a/patches/server/0127-Measure-last-tick-time.patch
+++ b/patches/server/0127-Measure-last-tick-time.patch
@@ -23,10 +23,10 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1b081bf1407d98a4cc664adc4633533a414447d0..80e7dc2314fa0727674a33475f7e180a34b5dd83 100644
+index ba5ca4f0cb3385911c51cd42c682d3125652880a..3c0e0a884cde094054e79aa4d2cf915126bddba4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1076,6 +1076,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1077,6 +1077,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      public static volatile RuntimeException chunkSystemCrash; // Paper - rewrite chunk system
  
@@ -38,7 +38,7 @@ index 1b081bf1407d98a4cc664adc4633533a414447d0..80e7dc2314fa0727674a33475f7e180a
      protected void runServer() {
          try {
              long serverStartTime = Util.getNanos(); // Paper
-@@ -1143,7 +1148,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1144,7 +1149,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  //MinecraftServer.currentTick = (int) (System.currentTimeMillis() / 50); // CraftBukkit // Paper - don't overwrite current tick time
                  lastTick = curTime;
                  this.nextTickTime += 50L;
@@ -48,7 +48,7 @@ index 1b081bf1407d98a4cc664adc4633533a414447d0..80e7dc2314fa0727674a33475f7e180a
                  this.mayHaveDelayedTasks = true;
                  this.delayedTasksMaxNextTickTime = Math.max(Util.getMillis() + 50L, this.nextTickTime);
                  this.waitUntilNextTick();
-@@ -1256,9 +1263,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1257,9 +1264,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      protected void waitUntilNextTick() {
          //this.executeAll(); // Paper - move this into the tick method for timings
diff --git a/patches/server/0135-Server-thread-priority-environment-variable.patch b/patches/server/0135-Server-thread-priority-environment-variable.patch
index 8381a87..d470598 100644
--- a/patches/server/0135-Server-thread-priority-environment-variable.patch
+++ b/patches/server/0135-Server-thread-priority-environment-variable.patch
@@ -7,10 +7,10 @@ License: AGPL-3.0 (https://www.gnu.org/licenses/agpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 80e7dc2314fa0727674a33475f7e180a34b5dd83..be40609be0b35e2cfbdbd9e00877507c6825e2a7 100644
+index 3c0e0a884cde094054e79aa4d2cf915126bddba4..77dd3605bede2f8d2574961a21560df4631f6277 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -186,6 +186,8 @@ import co.aikar.timings.MinecraftTimings; // Paper
+@@ -187,6 +187,8 @@ import co.aikar.timings.MinecraftTimings; // Paper
  
  public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements CommandSource, AutoCloseable {
  
@@ -19,7 +19,7 @@ index 80e7dc2314fa0727674a33475f7e180a34b5dd83..be40609be0b35e2cfbdbd9e00877507c
      private static MinecraftServer SERVER; // Paper
      public static final Logger LOGGER = LogUtils.getLogger();
      public static final net.kyori.adventure.text.logger.slf4j.ComponentLogger COMPONENT_LOGGER = net.kyori.adventure.text.logger.slf4j.ComponentLogger.logger(LOGGER.getName()); // Paper
-@@ -311,7 +313,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -312,7 +314,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          S s0 = serverFactory.apply(thread); // CraftBukkit - decompile error
  
          atomicreference.set(s0);