diff --git a/gradle.properties b/gradle.properties
index 7ce2274..5f55ea4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=org.galemc.gale
 version=1.21.1-R0.1-SNAPSHOT
 
 mcVersion=1.21.1
-paperRef=2aaf4369b61256c28c205ec1152132760b310ebd
+paperRef=c5a10665b8b80af650500b9263036f778f06d500
 
 org.gradle.caching=false
 org.gradle.parallel=true
diff --git a/patches/server/0008-Gale-configuration.patch b/patches/server/0008-Gale-configuration.patch
index 9aaa66f..b34df38 100644
--- a/patches/server/0008-Gale-configuration.patch
+++ b/patches/server/0008-Gale-configuration.patch
@@ -189,7 +189,7 @@ index 8f23276796037d048eb114952891a01a40971b3e..ac9ceb54b894119cb30a22d37e035e2c
      }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 23ddd26af762c1cd7fb3920669abb96b3213ab37..97e838cfb5abfdfc81fb583276d715f3f5bf6c43 100644
+index 696d075ca2883f3c37e35f983c4d020e5db89d16..1840332f79c5cfc2a913d80d9885939be92f87d6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -3,9 +3,6 @@ package net.minecraft.server;
@@ -217,10 +217,10 @@ index 23ddd26af762c1cd7fb3920669abb96b3213ab37..97e838cfb5abfdfc81fb583276d715f3
      // Spigot end
      public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations; // Paper - add paper configuration files
 +    public final GaleConfigurations galeConfigurations; // Gale - Gale configuration
-     public static long currentTickLong = 0L; // Paper - track current tick as a long
      public boolean isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
  
-@@ -497,6 +498,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     public volatile Thread shutdownThread; // Paper
+@@ -496,6 +497,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
          // CraftBukkit end
          this.paperConfigurations = services.paperConfigurations(); // Paper - add paper configuration files
diff --git a/patches/server/0011-Remove-vanilla-profiler.patch b/patches/server/0011-Remove-vanilla-profiler.patch
index 471f570..1e66495 100644
--- a/patches/server/0011-Remove-vanilla-profiler.patch
+++ b/patches/server/0011-Remove-vanilla-profiler.patch
@@ -180,7 +180,7 @@ index e9775b4506909bee65a74964f0d5391a0513de1d..1c4dd8acdcd571aceffe4b78599ca2c7
      }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 97e838cfb5abfdfc81fb583276d715f3f5bf6c43..2d25db0793acbdd1c95c0c6c0d7b50109d604bfe 100644
+index 1840332f79c5cfc2a913d80d9885939be92f87d6..161904cc1d802d9b113f68c2eb46a1c7a7c1b425 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -103,18 +103,9 @@ import net.minecraft.util.datafix.DataFixers;
@@ -217,7 +217,7 @@ index 97e838cfb5abfdfc81fb583276d715f3f5bf6c43..2d25db0793acbdd1c95c0c6c0d7b5010
      private ServerConnectionListener connection;
      public final ChunkProgressListenerFactory progressListenerFactory;
      @Nullable
-@@ -420,13 +403,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -419,13 +402,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
@@ -231,7 +231,7 @@ index 97e838cfb5abfdfc81fb583276d715f3f5bf6c43..2d25db0793acbdd1c95c0c6c0d7b5010
          this.random = RandomSource.create();
          this.port = -1;
          this.levels = Maps.newLinkedHashMap();
-@@ -1035,9 +1011,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1034,9 +1010,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          org.spigotmc.WatchdogThread.doStop(); // Paper
          // Paper end
          // CraftBukkit end
@@ -241,7 +241,7 @@ index 97e838cfb5abfdfc81fb583276d715f3f5bf6c43..2d25db0793acbdd1c95c0c6c0d7b5010
  
          MinecraftServer.LOGGER.info("Stopping server");
          Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
-@@ -1293,16 +1266,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1291,16 +1264,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
                  boolean flag = i == 0L;
  
@@ -258,7 +258,7 @@ index 97e838cfb5abfdfc81fb583276d715f3f5bf6c43..2d25db0793acbdd1c95c0c6c0d7b5010
                  this.tickServer(flag ? () -> {
                      return false;
                  } : this::haveTime);
-@@ -1313,7 +1279,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1311,7 +1277,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      throw new RuntimeException("Chunk system crash propagated to tick()", crash);
                  }
                  // Paper end - rewrite chunk system
@@ -266,7 +266,7 @@ index 97e838cfb5abfdfc81fb583276d715f3f5bf6c43..2d25db0793acbdd1c95c0c6c0d7b5010
                  this.mayHaveDelayedTasks = true;
                  this.delayedTasksMaxNextTickTimeNanos = Math.max(Util.getNanos() + i, this.nextTickTimeNanos);
                  this.startMeasuringTaskExecutionTime();
-@@ -1323,9 +1288,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1321,9 +1286,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      this.tickRateManager.endTickWork();
                  }
  
@@ -276,7 +276,7 @@ index 97e838cfb5abfdfc81fb583276d715f3f5bf6c43..2d25db0793acbdd1c95c0c6c0d7b5010
                  this.isReady = true;
                  JvmProfiler.INSTANCE.onServerTick(this.smoothedTickTimeMillis);
              }
-@@ -1535,7 +1498,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1533,7 +1496,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void doRunTask(TickTask ticktask) { // CraftBukkit - decompile error
@@ -284,7 +284,7 @@ index 97e838cfb5abfdfc81fb583276d715f3f5bf6c43..2d25db0793acbdd1c95c0c6c0d7b5010
          super.doRunTask(ticktask);
      }
  
-@@ -1609,7 +1571,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1607,7 +1569,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (playerSaveInterval < 0) {
              playerSaveInterval = autosavePeriod;
          }
@@ -292,7 +292,7 @@ index 97e838cfb5abfdfc81fb583276d715f3f5bf6c43..2d25db0793acbdd1c95c0c6c0d7b5010
          final boolean fullSave = autosavePeriod > 0 && this.tickCount % autosavePeriod == 0;
          try {
              this.isSaving = true;
-@@ -1624,7 +1585,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1622,7 +1583,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          } finally {
              this.isSaving = false;
          }
@@ -300,7 +300,7 @@ index 97e838cfb5abfdfc81fb583276d715f3f5bf6c43..2d25db0793acbdd1c95c0c6c0d7b5010
          // Paper end - Incremental chunk and player saving
          // Paper start - move executeAll() into full server tick timing
          try (co.aikar.timings.Timing ignored = MinecraftTimings.processTasksTimer.startTiming()) {
-@@ -1637,7 +1597,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1635,7 +1595,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          new com.destroystokyo.paper.event.server.ServerTickEndEvent(this.tickCount, ((double)(endTime - lastTick) / 1000000D), remaining).callEvent();
          this.server.spark.tickEnd(((double)(endTime - lastTick) / 1000000D)); // Paper - spark
          // Paper end - Server Tick Events
@@ -308,7 +308,7 @@ index 97e838cfb5abfdfc81fb583276d715f3f5bf6c43..2d25db0793acbdd1c95c0c6c0d7b5010
          long j = Util.getNanos() - i;
          int k = this.tickCount % 100;
  
-@@ -1651,7 +1610,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1649,7 +1608,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.tickTimes60s.add(this.tickCount, j);
          // Paper end - Add tick times API and /mspt command
          this.logTickMethodTime(i);
@@ -316,7 +316,7 @@ index 97e838cfb5abfdfc81fb583276d715f3f5bf6c43..2d25db0793acbdd1c95c0c6c0d7b5010
          org.spigotmc.WatchdogThread.tick(); // Spigot
          co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTiming(); // Paper
      }
-@@ -1742,11 +1700,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1740,11 +1698,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
@@ -328,7 +328,7 @@ index 97e838cfb5abfdfc81fb583276d715f3f5bf6c43..2d25db0793acbdd1c95c0c6c0d7b5010
          //Iterator iterator = this.getAllLevels().iterator(); // Paper - Throw exception on world create while being ticked; moved down
  
          // CraftBukkit start
-@@ -1788,21 +1744,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1786,21 +1742,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 - Perf: Optimize Hoppers
              worldserver.updateLagCompensationTick(); // Paper - lag compensation
  
@@ -350,7 +350,7 @@ index 97e838cfb5abfdfc81fb583276d715f3f5bf6c43..2d25db0793acbdd1c95c0c6c0d7b5010
              try {
                  worldserver.timings.doTick.startTiming(); // Spigot
                  worldserver.tick(shouldKeepTicking);
-@@ -1814,17 +1761,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1812,17 +1759,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  throw new ReportedException(crashreport);
              }
  
@@ -368,7 +368,7 @@ index 97e838cfb5abfdfc81fb583276d715f3f5bf6c43..2d25db0793acbdd1c95c0c6c0d7b5010
          MinecraftTimings.playerListTimer.startTiming(); // Spigot // Paper
          this.playerList.tick();
          MinecraftTimings.playerListTimer.stopTiming(); // Spigot // Paper
-@@ -1832,15 +1775,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1830,15 +1773,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              GameTestTicker.SINGLETON.tick();
          }
  
@@ -384,7 +384,7 @@ index 97e838cfb5abfdfc81fb583276d715f3f5bf6c43..2d25db0793acbdd1c95c0c6c0d7b5010
          iterator = this.playerList.getPlayers().iterator();
  
          while (iterator.hasNext()) {
-@@ -1850,7 +1790,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1848,7 +1788,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              entityplayer.connection.resumeFlushing();
          }
  
@@ -392,7 +392,7 @@ index 97e838cfb5abfdfc81fb583276d715f3f5bf6c43..2d25db0793acbdd1c95c0c6c0d7b5010
      }
  
      private void synchronizeTime(ServerLevel world) {
-@@ -1858,7 +1797,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1856,7 +1795,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void forceTimeSynchronization() {
@@ -400,7 +400,7 @@ index 97e838cfb5abfdfc81fb583276d715f3f5bf6c43..2d25db0793acbdd1c95c0c6c0d7b5010
          Iterator iterator = this.getAllLevels().iterator();
  
          while (iterator.hasNext()) {
-@@ -1866,8 +1804,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1864,8 +1802,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
              this.synchronizeTime(worldserver);
          }
@@ -409,7 +409,7 @@ index 97e838cfb5abfdfc81fb583276d715f3f5bf6c43..2d25db0793acbdd1c95c0c6c0d7b5010
      }
  
      public boolean isLevelEnabled(Level world) {
-@@ -2579,7 +2515,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2577,7 +2513,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public ProfilerFiller getProfiler() {
@@ -418,7 +418,7 @@ index 97e838cfb5abfdfc81fb583276d715f3f5bf6c43..2d25db0793acbdd1c95c0c6c0d7b5010
      }
  
      public abstract boolean isSingleplayerOwner(GameProfile profile);
-@@ -2824,53 +2760,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2822,53 +2758,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
      // CraftBukkit end
  
@@ -472,7 +472,7 @@ index 97e838cfb5abfdfc81fb583276d715f3f5bf6c43..2d25db0793acbdd1c95c0c6c0d7b5010
      public Path getWorldPath(LevelResource worldSavePath) {
          return this.storageSource.getLevelPath(worldSavePath);
      }
-@@ -2920,25 +2809,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2918,25 +2807,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return this.isSaving;
      }
  
@@ -498,7 +498,7 @@ index 97e838cfb5abfdfc81fb583276d715f3f5bf6c43..2d25db0793acbdd1c95c0c6c0d7b5010
      public int getMaxChainedNeighborUpdates() {
          return 1000000;
      }
-@@ -3037,56 +2907,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -3035,56 +2905,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
      }
  
diff --git a/patches/server/0041-Reduce-hopper-item-checks.patch b/patches/server/0041-Reduce-hopper-item-checks.patch
index cb282f2..8874dbc 100644
--- a/patches/server/0041-Reduce-hopper-item-checks.patch
+++ b/patches/server/0041-Reduce-hopper-item-checks.patch
@@ -17,7 +17,7 @@ Licensed under: MIT (https://opensource.org/licenses/MIT)
 Only do an item "suck in" action once per second
 
 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 ea0d9335446b20073b9aafb9de453097355db79c..c1bb44fd92ee4f3b900f29e3f9069841ca19fa5d 100644
+index 4423973d4d9a2c3879d98d1d4c8b8c117c677ac5..adbe1c6aad0abe367280b75c4d6691ac5e26bc30 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -22,12 +22,14 @@ import net.minecraft.world.entity.EntityType;
@@ -35,7 +35,7 @@ index ea0d9335446b20073b9aafb9de453097355db79c..c1bb44fd92ee4f3b900f29e3f9069841
  import net.minecraft.world.phys.Vec3;
  // CraftBukkit start
  import net.minecraft.server.MinecraftServer;
-@@ -235,11 +237,31 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -233,11 +235,31 @@ public class ItemEntity extends Entity implements TraceableEntity {
                  }
                  // CraftBukkit end
                  this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
@@ -67,7 +67,7 @@ index ea0d9335446b20073b9aafb9de453097355db79c..c1bb44fd92ee4f3b900f29e3f9069841
      // Spigot start - copied from above
      @Override
      public void inactiveTick() {
-@@ -259,7 +281,13 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -258,7 +280,13 @@ public class ItemEntity extends Entity implements TraceableEntity {
              }
              // CraftBukkit end
              this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
diff --git a/patches/server/0064-Fix-MC-26304.patch b/patches/server/0064-Fix-MC-26304.patch
index aa6ea02..ef475b6 100644
--- a/patches/server/0064-Fix-MC-26304.patch
+++ b/patches/server/0064-Fix-MC-26304.patch
@@ -13,7 +13,7 @@ As part of: Mirai (https://github.com/etil2jz/Mirai)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
-index a2fafef89d5354e2cb02f5672810909950a57777..b9c590bfa0ebc2f6399f6b98a084a0074b331483 100644
+index bf2c303a314205590a2839e0f729af3a9ff40a86..56288c4cd5693835690234b0da13c2bd3e11ef45 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
 @@ -47,6 +47,7 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
@@ -24,7 +24,7 @@ index a2fafef89d5354e2cb02f5672810909950a57777..b9c590bfa0ebc2f6399f6b98a084a007
      private NonNullList<ItemStack> items;
      public int brewTime;
      private boolean[] lastPotionCount;
-@@ -303,6 +304,22 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
+@@ -301,6 +302,22 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
          }
  
          this.fuel = nbt.getByte("Fuel");
@@ -47,7 +47,7 @@ index a2fafef89d5354e2cb02f5672810909950a57777..b9c590bfa0ebc2f6399f6b98a084a007
      }
  
      @Override
-@@ -311,6 +328,18 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
+@@ -309,6 +326,18 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
          nbt.putShort("BrewTime", (short) this.brewTime);
          ContainerHelper.saveAllItems(nbt, this.items, registryLookup);
          nbt.putByte("Fuel", (byte) this.fuel);
diff --git a/patches/server/0109-5-second-TPS-average.patch b/patches/server/0109-5-second-TPS-average.patch
index 540e46a..5af014a 100644
--- a/patches/server/0109-5-second-TPS-average.patch
+++ b/patches/server/0109-5-second-TPS-average.patch
@@ -59,10 +59,10 @@ index 039a86034928a5eb7aaa2d7ca76a7bddcca346bd..7c32c60100cf2bd109eb8762efa856c1
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2d25db0793acbdd1c95c0c6c0d7b50109d604bfe..79e2cd6e47e037aaec68afa3fa8544fee3955e8e 100644
+index 161904cc1d802d9b113f68c2eb46a1c7a7c1b425..c64874029dae951abf5d57b8dd7875d2ebfc8b54 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1137,6 +1137,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1136,6 +1136,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 2d25db0793acbdd1c95c0c6c0d7b50109d604bfe..79e2cd6e47e037aaec68afa3fa8544fe
      public final RollingAverage tps1 = new RollingAverage(60);
      public final RollingAverage tps5 = new RollingAverage(60 * 5);
      public final RollingAverage tps15 = new RollingAverage(60 * 15);
-@@ -1251,6 +1252,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1249,6 +1250,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  if (++MinecraftServer.currentTick % MinecraftServer.SAMPLE_INTERVAL == 0) {
                      final long diff = currentTime - tickSection;
                      final java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);
diff --git a/patches/server/0110-Measure-last-tick-time.patch b/patches/server/0110-Measure-last-tick-time.patch
index a002b42..ab2e694 100644
--- a/patches/server/0110-Measure-last-tick-time.patch
+++ b/patches/server/0110-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 79e2cd6e47e037aaec68afa3fa8544fee3955e8e..b01b536b41913dd78ef752a5fbce399461c97a00 100644
+index c64874029dae951abf5d57b8dd7875d2ebfc8b54..5b347162c668dd97f1b601d93318efa7abeb03e2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1185,6 +1185,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1184,6 +1184,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      // Paper end
      // Spigot End
  
@@ -38,7 +38,7 @@ index 79e2cd6e47e037aaec68afa3fa8544fee3955e8e..b01b536b41913dd78ef752a5fbce3994
      protected void runServer() {
          try {
              long serverStartTime = Util.getNanos(); // Paper
-@@ -1271,9 +1276,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1269,9 +1274,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  //MinecraftServer.currentTick = (int) (System.currentTimeMillis() / 50); // CraftBukkit // Paper - don't overwrite current tick time
                  lastTick = currentTime;
                  this.nextTickTimeNanos += i;
@@ -50,7 +50,7 @@ index 79e2cd6e47e037aaec68afa3fa8544fee3955e8e..b01b536b41913dd78ef752a5fbce3994
                  // Paper start - rewrite chunk system
                  final Throwable crash = this.chunkSystemCrash;
                  if (crash != null) {
-@@ -1437,9 +1444,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1435,9 +1442,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/0124-Server-thread-priority-environment-variable.patch b/patches/server/0124-Server-thread-priority-environment-variable.patch
index 0f471d9..02e3ba0 100644
--- a/patches/server/0124-Server-thread-priority-environment-variable.patch
+++ b/patches/server/0124-Server-thread-priority-environment-variable.patch
@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-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 b01b536b41913dd78ef752a5fbce399461c97a00..f4dd63ae1a9715f3cd10949ca49a269897443e56 100644
+index 5b347162c668dd97f1b601d93318efa7abeb03e2..f39c51ae8ea689cb089cd9d4195276c2cfdaf1b7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -191,6 +191,8 @@ import co.aikar.timings.MinecraftTimings; // Paper
@@ -19,7 +19,7 @@ index b01b536b41913dd78ef752a5fbce399461c97a00..f4dd63ae1a9715f3cd10949ca49a2698
      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
-@@ -325,6 +327,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -324,6 +326,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          S s0 = serverFactory.apply(thread); // CraftBukkit - decompile error
  
          atomicreference.set(s0);