diff --git a/patches/server/0005-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch
index d3f216fcec..9b4d9c165f 100644
--- a/patches/server/0005-Paper-config-files.patch
+++ b/patches/server/0005-Paper-config-files.patch
@@ -4585,10 +4585,10 @@ index e7240acad17dc9c0d93f2792cc0d90c1855ac436..35e7f8e7b19c217fa5f3f55abb0f8b9c
              String s = (String) Optional.ofNullable((String) optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
              LevelStorageSource convertable = LevelStorageSource.createDefault(file.toPath());
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c7d90803c302fc3cb06f44abf12d86c7e02944cd..a6e12acf65068a2eaea75a7df877f6145a229195 100644
+index 60e683ac0adaa192c502d059f6e448d0a23e8a09..6877a10fe56b46cf3fb7ccccf5a55e57d03048e9 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
+@@ -294,6 +294,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      private static final int SAMPLE_INTERVAL = 100;
      public final double[] recentTps = new double[ 3 ];
      // Spigot end
@@ -4596,7 +4596,7 @@ index c7d90803c302fc3cb06f44abf12d86c7e02944cd..a6e12acf65068a2eaea75a7df877f614
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
-@@ -385,6 +386,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -384,6 +385,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              }
          }
          Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
@@ -4643,7 +4643,7 @@ index 71e7beac6cf1e0f813d5ff3e9c51c13491be7139..f1cc27809c1e8612f7c4fa912f5e39c0
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index a58c0be585a2761d5b781a23934b956def221c5b..2ac30ef2dd72582f2b7f6a05b1f94b12b44fafc9 100644
+index ea5657d31f51469d6c0b9463fcc5cea9c270fb2e..546ad678af2705e3956f5f139aa847354a6fdeae 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -183,6 +183,10 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -4658,10 +4658,10 @@ index a58c0be585a2761d5b781a23934b956def221c5b..2ac30ef2dd72582f2b7f6a05b1f94b12
          this.setPvpAllowed(dedicatedserverproperties.pvp);
          this.setFlightAllowed(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/net/minecraft/server/dedicated/Settings.java b/src/main/java/net/minecraft/server/dedicated/Settings.java
-index 635c1164defec812af378a69d45c7ae0aed5024f..9dde5b89e6de9d470b0c0b08e3aa6c471cd075fe 100644
+index 37ab411817008d4e6194e177d88d50931e53b42e..ca23639f15107ccd43b874ae38fa37279b827a8f 100644
 --- a/src/main/java/net/minecraft/server/dedicated/Settings.java
 +++ b/src/main/java/net/minecraft/server/dedicated/Settings.java
-@@ -114,6 +114,7 @@ public abstract class Settings<T extends Settings<T>> {
+@@ -119,6 +119,7 @@ public abstract class Settings<T extends Settings<T>> {
          try {
              // CraftBukkit start - Don't attempt writing to file if it's read only
              if (path.toFile().exists() && !path.toFile().canWrite()) {
diff --git a/patches/server/0006-MC-Dev-fixes.patch b/patches/server/0006-MC-Dev-fixes.patch
index 0cedf4efb3..becf3158af 100644
--- a/patches/server/0006-MC-Dev-fixes.patch
+++ b/patches/server/0006-MC-Dev-fixes.patch
@@ -94,10 +94,10 @@ index 41d6569c00db3d467f6e90d33ebd261529b89f4c..5f051cb22ae77f4d8994b07ac5b963bd
          };
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a6e12acf65068a2eaea75a7df877f6145a229195..b45950f3fec4540f9a65c7704a34125d9e588dcb 100644
+index 6877a10fe56b46cf3fb7ccccf5a55e57d03048e9..8c7d762219e848387b153fb50553b7de58bc9627 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1775,7 +1775,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1774,7 +1774,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              PackRepository resourcepackrepository = this.packRepository;
  
              Objects.requireNonNull(this.packRepository);
diff --git a/patches/server/0009-MC-Utils.patch b/patches/server/0009-MC-Utils.patch
index a9c818383b..7c78ffeef9 100644
--- a/patches/server/0009-MC-Utils.patch
+++ b/patches/server/0009-MC-Utils.patch
@@ -5538,10 +5538,10 @@ index e6c4379b0fd7c1338e1713281cd9515cb54acecb..a63e7ee5c42bd51312155feab31c6ec4
                          throw new SkipPacketException(var10);
                      } else {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b45950f3fec4540f9a65c7704a34125d9e588dcb..d2a858f4e15920649aaa39fdebfad5b50a788cc5 100644
+index 8c7d762219e848387b153fb50553b7de58bc9627..e896917b3546f9d075179198c6dcd714f6cddd50 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -296,6 +296,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -295,6 +295,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public final double[] recentTps = new double[ 3 ];
      // Spigot end
      public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations;
@@ -5549,7 +5549,7 @@ index b45950f3fec4540f9a65c7704a34125d9e588dcb..d2a858f4e15920649aaa39fdebfad5b5
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
-@@ -929,6 +930,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -928,6 +929,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              MinecraftServer.LOGGER.error("Failed to unlock level {}", this.storageSource.getLevelId(), ioexception1);
          }
          // Spigot start
@@ -5559,7 +5559,7 @@ index b45950f3fec4540f9a65c7704a34125d9e588dcb..d2a858f4e15920649aaa39fdebfad5b5
          if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) {
              MinecraftServer.LOGGER.info("Saving usercache.json");
              this.getProfileCache().save();
-@@ -993,6 +997,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -992,6 +996,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      this.lastOverloadWarning = this.nextTickTime;
                  }
  
@@ -5567,7 +5567,7 @@ index b45950f3fec4540f9a65c7704a34125d9e588dcb..d2a858f4e15920649aaa39fdebfad5b5
                  if ( tickCount++ % MinecraftServer.SAMPLE_INTERVAL == 0 )
                  {
                      double currentTps = 1E3 / ( curTime - tickSection ) * MinecraftServer.SAMPLE_INTERVAL;
-@@ -1210,7 +1215,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1209,7 +1214,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              MinecraftServer.LOGGER.debug("Autosave finished");
              SpigotTimings.worldSaveTimer.stopTiming(); // Spigot
          }
@@ -5576,7 +5576,7 @@ index b45950f3fec4540f9a65c7704a34125d9e588dcb..d2a858f4e15920649aaa39fdebfad5b5
          this.profiler.push("tallying");
          long j = this.tickTimes[this.tickCount % 100] = Util.getNanos() - i;
  
-@@ -1300,6 +1305,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1299,6 +1304,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              try {
                  worldserver.timings.doTick.startTiming(); // Spigot
                  worldserver.tick(shouldKeepTicking);
diff --git a/patches/server/0010-Adventure.patch b/patches/server/0010-Adventure.patch
index d14ab492d1..289b2559f8 100644
--- a/patches/server/0010-Adventure.patch
+++ b/patches/server/0010-Adventure.patch
@@ -2189,7 +2189,7 @@ index 5f051cb22ae77f4d8994b07ac5b963bd0ff05673..7952635a963e28cb670c8f4869664103
          list.forEach((loader) -> {
              Registry<?> registry = loader.getFirst();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d2a858f4e15920649aaa39fdebfad5b50a788cc5..049755ed087a764cd1f0d7df82c21eef7538fbbf 100644
+index e896917b3546f9d075179198c6dcd714f6cddd50..58457e3493100e9726288ae7b027ab47947bd4d4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -194,6 +194,7 @@ import org.bukkit.craftbukkit.SpigotTimings; // Spigot
@@ -2210,7 +2210,7 @@ index d2a858f4e15920649aaa39fdebfad5b50a788cc5..049755ed087a764cd1f0d7df82c21eef
      private int playerIdleTimeout;
      public final long[] tickTimes;
      @Nullable
-@@ -1232,7 +1232,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1231,7 +1231,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      private ServerStatus buildServerStatus() {
          ServerStatus.Players serverping_serverpingplayersample = this.buildPlayerStatus();
  
@@ -2219,7 +2219,7 @@ index d2a858f4e15920649aaa39fdebfad5b50a788cc5..049755ed087a764cd1f0d7df82c21eef
      }
  
      private ServerStatus.Players buildPlayerStatus() {
-@@ -1261,6 +1261,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1260,6 +1260,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          SpigotTimings.schedulerTimer.startTiming(); // Spigot
          this.server.getScheduler().mainThreadHeartbeat(this.tickCount); // CraftBukkit
          SpigotTimings.schedulerTimer.stopTiming(); // Spigot
@@ -2227,7 +2227,7 @@ index d2a858f4e15920649aaa39fdebfad5b50a788cc5..049755ed087a764cd1f0d7df82c21eef
          this.profiler.push("commandFunctions");
          SpigotTimings.commandFunctionsTimer.startTiming(); // Spigot
          this.getFunctions().tick();
-@@ -1626,10 +1627,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1625,10 +1626,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public abstract boolean isCommandBlockEnabled();
  
      public String getMotd() {
@@ -2249,7 +2249,7 @@ index d2a858f4e15920649aaa39fdebfad5b50a788cc5..049755ed087a764cd1f0d7df82c21eef
          this.motd = motd;
      }
  
-@@ -2343,39 +2354,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2342,39 +2353,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void logChatMessage(Component message, ChatType.Bound params, @Nullable String prefix) {
@@ -3474,10 +3474,10 @@ index f3cb4102ab223f379f60dac317df7da1fab812a8..324e6d1a4fadd3e557e4ba05f04e6a58
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/CraftRemoteConsoleCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/CraftRemoteConsoleCommandSender.java
-index 03027fe2b7ffe4c7ce7f1bb4f56051a4743c7f01..a6612cc0ea87aeb8e87521ff7b5fe58c7b06b9ef 100644
+index d545a3fa3d7728f9d4761175fc0acaa7a6fe3b01..ad731c5f76f19394866a121c64d4169ea8fb8cd7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/CraftRemoteConsoleCommandSender.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/CraftRemoteConsoleCommandSender.java
-@@ -29,6 +29,13 @@ public class CraftRemoteConsoleCommandSender extends ServerCommandSender impleme
+@@ -39,6 +39,13 @@ public class CraftRemoteConsoleCommandSender extends ServerCommandSender impleme
          return "Rcon";
      }
  
diff --git a/patches/server/0014-Timings-v2.patch b/patches/server/0014-Timings-v2.patch
index a030247e4e..7f4636bd31 100644
--- a/patches/server/0014-Timings-v2.patch
+++ b/patches/server/0014-Timings-v2.patch
@@ -732,7 +732,7 @@ index fc4dcd801480fe6d89a985de411baa9a3a66f6ef..4a1148a76020089caf01f888f87afdbb
                      } catch (Exception exception) {
                          if (listener.shouldPropagateHandlingExceptions()) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 049755ed087a764cd1f0d7df82c21eef7538fbbf..6994fff6ce9b946adba7dabf84b165f404495257 100644
+index 58457e3493100e9726288ae7b027ab47947bd4d4..73c3070b2e300e0ab29ac1db1631023cef7970f8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -189,7 +189,7 @@ import org.bukkit.event.player.AsyncPlayerChatPreviewEvent;
@@ -744,7 +744,7 @@ index 049755ed087a764cd1f0d7df82c21eef7538fbbf..6994fff6ce9b946adba7dabf84b165f4
  
  public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements CommandSource, AutoCloseable {
  
-@@ -861,6 +861,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -860,6 +860,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
  
          MinecraftServer.LOGGER.info("Stopping server");
@@ -752,7 +752,7 @@ index 049755ed087a764cd1f0d7df82c21eef7538fbbf..6994fff6ce9b946adba7dabf84b165f4
          // CraftBukkit start
          if (this.server != null) {
              this.server.disablePlugins();
-@@ -1099,9 +1100,21 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1098,9 +1099,21 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      private boolean haveTime() {
          // CraftBukkit start
@@ -774,7 +774,7 @@ index 049755ed087a764cd1f0d7df82c21eef7538fbbf..6994fff6ce9b946adba7dabf84b165f4
      private void executeModerately() {
          this.runAllTasks();
          java.util.concurrent.locks.LockSupport.parkNanos("executing tasks", 1000L);
-@@ -1109,9 +1122,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1108,9 +1121,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      // CraftBukkit end
  
      protected void waitUntilNextTick() {
@@ -786,7 +786,7 @@ index 049755ed087a764cd1f0d7df82c21eef7538fbbf..6994fff6ce9b946adba7dabf84b165f4
          });
      }
  
-@@ -1196,9 +1209,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1195,9 +1208,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public void onServerExit() {}
  
      public void tickServer(BooleanSupplier shouldKeepTicking) {
@@ -805,7 +805,7 @@ index 049755ed087a764cd1f0d7df82c21eef7538fbbf..6994fff6ce9b946adba7dabf84b165f4
          ++this.tickCount;
          this.tickChildren(shouldKeepTicking);
          if (i - this.lastServerStatus >= 5000000000L) {
-@@ -1207,15 +1228,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1206,15 +1227,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
  
          if (this.autosavePeriod > 0 && this.tickCount % this.autosavePeriod == 0) { // CraftBukkit
@@ -826,7 +826,7 @@ index 049755ed087a764cd1f0d7df82c21eef7538fbbf..6994fff6ce9b946adba7dabf84b165f4
          this.profiler.push("tallying");
          long j = this.tickTimes[this.tickCount % 100] = Util.getNanos() - i;
  
-@@ -1225,8 +1249,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1224,8 +1248,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.frameTimer.logFrameDuration(k - i);
          this.profiler.pop();
          org.spigotmc.WatchdogThread.tick(); // Spigot
@@ -836,7 +836,7 @@ index 049755ed087a764cd1f0d7df82c21eef7538fbbf..6994fff6ce9b946adba7dabf84b165f4
      }
  
      private ServerStatus buildServerStatus() {
-@@ -1258,26 +1281,26 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1257,26 +1280,26 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void tickChildren(BooleanSupplier shouldKeepTicking) {
@@ -870,7 +870,7 @@ index 049755ed087a764cd1f0d7df82c21eef7538fbbf..6994fff6ce9b946adba7dabf84b165f4
          // Send time updates to everyone, it will get the right time from the world the player is in.
          if (this.tickCount % 20 == 0) {
              for (int i = 0; i < this.getPlayerList().players.size(); ++i) {
-@@ -1285,7 +1308,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1284,7 +1307,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  entityplayer.connection.send(new ClientboundSetTimePacket(entityplayer.level().getGameTime(), entityplayer.getPlayerTime(), entityplayer.level().getGameRules().getBoolean(GameRules.RULE_DAYLIGHT))); // Add support for per player time
              }
          }
@@ -879,7 +879,7 @@ index 049755ed087a764cd1f0d7df82c21eef7538fbbf..6994fff6ce9b946adba7dabf84b165f4
  
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
-@@ -1331,24 +1354,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1330,24 +1353,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
  
          this.profiler.popPush("connection");
@@ -924,7 +924,7 @@ index 009ef03e520aeb57b29b5375a65634ed76aa9163..4a610b712acfe0b1b4dcf4988bc22c6a
                  i = this.context.runTopCommand(function, source);
              } finally {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 59eed41e1c6012650597f1faa85063a2d536873f..51eac8b7177db66c005e4eaca689cf96d10edeaa 100644
+index cfc4cad33d36e720f32b7ad6d1d4b3983f7aad39..14101c77fd9814a5d1e8e1bf0d8584f42086b051 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -58,8 +58,9 @@ import org.apache.logging.log4j.Level;
@@ -934,11 +934,11 @@ index 59eed41e1c6012650597f1faa85063a2d536873f..51eac8b7177db66c005e4eaca689cf96
 -import org.bukkit.craftbukkit.SpigotTimings; // Spigot
 +import co.aikar.timings.MinecraftTimings; // Paper
  import org.bukkit.event.server.ServerCommandEvent;
-+import org.bukkit.craftbukkit.util.Waitable;
++import org.bukkit.craftbukkit.util.Waitable; // Paper
  import org.bukkit.event.server.RemoteServerCommandEvent;
  // CraftBukkit end
  
-@@ -404,7 +405,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -403,7 +404,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
      }
  
      public void handleConsoleInputs() {
@@ -947,7 +947,7 @@ index 59eed41e1c6012650597f1faa85063a2d536873f..51eac8b7177db66c005e4eaca689cf96
          while (!this.consoleInput.isEmpty()) {
              ConsoleInput servercommand = (ConsoleInput) this.consoleInput.remove(0);
  
-@@ -419,7 +420,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -418,7 +419,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              // CraftBukkit end
          }
  
@@ -956,22 +956,28 @@ index 59eed41e1c6012650597f1faa85063a2d536873f..51eac8b7177db66c005e4eaca689cf96
      }
  
      @Override
-@@ -667,6 +668,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -671,7 +672,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+     }
  
-     @Override
-     public String runCommand(String command) {
-+        Waitable[] waitableArray = new Waitable[1];
-         this.rconConsoleSource.prepareForCommand();
+     public String runCommand(RconConsoleSource rconConsoleSource, String s) {
++        Waitable[] waitableArray = new Waitable[1]; // Paper
+         rconConsoleSource.prepareForCommand();
++        final java.util.concurrent.atomic.AtomicReference<String> command = new java.util.concurrent.atomic.AtomicReference<>(s); // Paper
          this.executeBlocking(() -> {
-             // CraftBukkit start - fire RemoteServerCommandEvent
-@@ -675,10 +677,39 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+             CommandSourceStack wrapper = rconConsoleSource.createCommandSourceStack();
+             RemoteServerCommandEvent event = new RemoteServerCommandEvent(rconConsoleSource.getBukkitSender(wrapper), s);
+@@ -679,9 +682,40 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              if (event.isCancelled()) {
                  return;
              }
+-            ConsoleInput serverCommand = new ConsoleInput(event.getCommand(), wrapper);
+-            server.dispatchServerCommand(event.getSender(), serverCommand);
++
 +            // Paper start
-+            if (command.toLowerCase().startsWith("timings") && command.toLowerCase().matches("timings (report|paste|get|merged|seperate)")) {
++            command.set(event.getCommand());
++            if (event.getCommand().toLowerCase().startsWith("timings") && event.getCommand().toLowerCase().matches("timings (report|paste|get|merged|seperate)")) {
 +                org.bukkit.command.BufferedCommandSender sender = new org.bukkit.command.BufferedCommandSender();
-+                Waitable<String> waitable = new Waitable<String>() {
++                Waitable<String> waitable = new Waitable<>() {
 +                    @Override
 +                    protected String evaluate() {
 +                        return sender.getBuffer();
@@ -981,10 +987,9 @@ index 59eed41e1c6012650597f1faa85063a2d536873f..51eac8b7177db66c005e4eaca689cf96
 +                co.aikar.timings.Timings.generateReport(new co.aikar.timings.TimingsReportListener(sender, waitable));
 +            } else {
 +            // Paper end
-             ConsoleInput serverCommand = new ConsoleInput(event.getCommand(), this.rconConsoleSource.createCommandSourceStack());
-             server.dispatchServerCommand(remoteConsole, serverCommand);
++                ConsoleInput serverCommand = new ConsoleInput(event.getCommand(), wrapper);
++                server.dispatchServerCommand(event.getSender(), serverCommand);
 +            } // Paper
-             // CraftBukkit end
          });
 +        // Paper start
 +        if (waitableArray[0] != null) {
@@ -993,17 +998,17 @@ index 59eed41e1c6012650597f1faa85063a2d536873f..51eac8b7177db66c005e4eaca689cf96
 +            try {
 +                return waitable.get();
 +            } catch (java.util.concurrent.ExecutionException e) {
-+                throw new RuntimeException("Exception processing rcon command " + command, e.getCause());
++                throw new RuntimeException("Exception processing rcon command " + command.get(), e.getCause());
 +            } catch (InterruptedException e) {
 +                Thread.currentThread().interrupt(); // Maintain interrupted state
-+                throw new RuntimeException("Interrupted processing rcon command " + command, e);
++                throw new RuntimeException("Interrupted processing rcon command " + command.get(), e);
 +            }
 +
 +        }
 +        // Paper end
-         return this.rconConsoleSource.getCommandResponse();
+         return rconConsoleSource.getCommandResponse();
+         // CraftBukkit end
      }
- 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
 index c943e64d70bab240f8dc733e78a185172664c5e4..a645263f148a25e5b4baeed51775eb8e7f596fe8 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
diff --git a/patches/server/0019-Rewrite-chunk-system.patch b/patches/server/0019-Rewrite-chunk-system.patch
index d035ec2c61..c48daa5463 100644
--- a/patches/server/0019-Rewrite-chunk-system.patch
+++ b/patches/server/0019-Rewrite-chunk-system.patch
@@ -15686,7 +15686,7 @@ index 0000000000000000000000000000000000000000..962d3cae6340fc11607b59355e291629
 +
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 0083b66889bfb6d3c4e4219fc73f410477109e37..499b7e84a42517c9a82e27e425a8aefd9ad614ee 100644
+index 45f1436cdd4b81b621ab71e4336c2aa666572105..622684f50a12ddd412e2d6ff305407e7c13684bf 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -24,6 +24,45 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -16831,10 +16831,10 @@ index 72c2f0bf9434e09a0dd51294d3a2200f1e0ed1b1..5d56c35d6d3478dbc53e4f5c3547d4dc
                  DedicatedServer dedicatedserver1 = new DedicatedServer(optionset, worldLoader.get(), thread, convertable_conversionsession, resourcepackrepository, worldstem, dedicatedserversettings, DataFixers.getDataFixer(), services, LoggerChunkProgressListener::new);
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6994fff6ce9b946adba7dabf84b165f404495257..ce9f408ff7394d931bc015c08e9db8221b8f7f39 100644
+index 73c3070b2e300e0ab29ac1db1631023cef7970f8..f46ae930c6d1609dbefb56e67853f6e8504b749f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -300,7 +300,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -299,7 +299,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
@@ -16843,7 +16843,7 @@ index 6994fff6ce9b946adba7dabf84b165f404495257..ce9f408ff7394d931bc015c08e9db822
              ((MinecraftServer) atomicreference.get()).runServer();
          }, "Server thread");
  
-@@ -583,7 +583,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -582,7 +582,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.forceDifficulty();
          for (ServerLevel worldserver : this.getAllLevels()) {
              this.prepareLevels(worldserver.getChunkSource().chunkMap.progressListener, worldserver);
@@ -16852,7 +16852,7 @@ index 6994fff6ce9b946adba7dabf84b165f404495257..ce9f408ff7394d931bc015c08e9db822
              this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(worldserver.getWorld()));
          }
  
-@@ -783,6 +783,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -782,6 +782,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public abstract boolean shouldRconBroadcast();
  
      public boolean saveAllChunks(boolean suppressLogs, boolean flush, boolean force) {
@@ -16865,7 +16865,7 @@ index 6994fff6ce9b946adba7dabf84b165f404495257..ce9f408ff7394d931bc015c08e9db822
          boolean flag3 = false;
  
          for (Iterator iterator = this.getAllLevels().iterator(); iterator.hasNext(); flag3 = true) {
-@@ -791,8 +797,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -790,8 +796,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              if (!suppressLogs) {
                  MinecraftServer.LOGGER.info("Saving chunks for level '{}'/{}", worldserver, worldserver.dimension().location());
              }
@@ -16880,7 +16880,7 @@ index 6994fff6ce9b946adba7dabf84b165f404495257..ce9f408ff7394d931bc015c08e9db822
          }
  
          // CraftBukkit start - moved to WorldServer.save
-@@ -811,7 +821,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -810,7 +820,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              while (iterator1.hasNext()) {
                  ServerLevel worldserver2 = (ServerLevel) iterator1.next();
  
@@ -16889,7 +16889,7 @@ index 6994fff6ce9b946adba7dabf84b165f404495257..ce9f408ff7394d931bc015c08e9db822
              }
  
              MinecraftServer.LOGGER.info("ThreadedAnvilChunkStorage: All dimensions are saved");
-@@ -891,36 +901,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -890,36 +900,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              }
          }
  
@@ -16927,7 +16927,7 @@ index 6994fff6ce9b946adba7dabf84b165f404495257..ce9f408ff7394d931bc015c08e9db822
  
          this.isSaving = false;
          this.resources.close();
-@@ -939,7 +920,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -938,7 +919,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.getProfileCache().save();
          }
          // Spigot end
@@ -16936,7 +16936,7 @@ index 6994fff6ce9b946adba7dabf84b165f404495257..ce9f408ff7394d931bc015c08e9db822
      }
  
      public String getLocalIp() {
-@@ -973,6 +954,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -972,6 +953,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
      // Spigot End
  
@@ -16945,7 +16945,7 @@ index 6994fff6ce9b946adba7dabf84b165f404495257..ce9f408ff7394d931bc015c08e9db822
      protected void runServer() {
          try {
              if (!this.initServer()) {
-@@ -987,6 +970,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -986,6 +969,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              Arrays.fill( recentTps, 20 );
              long curTime, tickSection = Util.getMillis(), tickCount = 1;
              while (this.running) {
@@ -16958,7 +16958,7 @@ index 6994fff6ce9b946adba7dabf84b165f404495257..ce9f408ff7394d931bc015c08e9db822
                  long i = (curTime = Util.getMillis()) - this.nextTickTime;
  
                  if (i > 5000L && this.nextTickTime - this.lastOverloadWarning >= 30000L) { // CraftBukkit
-@@ -1099,6 +1088,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1098,6 +1087,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      private boolean haveTime() {
@@ -16970,7 +16970,7 @@ index 6994fff6ce9b946adba7dabf84b165f404495257..ce9f408ff7394d931bc015c08e9db822
          // CraftBukkit start
          if (isOversleep) return canOversleep();// Paper - because of our changes, this logic is broken
          return this.forceTicks || this.runningTask() || Util.getMillis() < (this.mayHaveDelayedTasks ? this.delayedTasksMaxNextTickTime : this.nextTickTime);
-@@ -2248,7 +2242,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2247,7 +2241,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      // CraftBukkit start
      @Override
      public boolean isSameThread() {
@@ -16980,10 +16980,10 @@ index 6994fff6ce9b946adba7dabf84b165f404495257..ce9f408ff7394d931bc015c08e9db822
  
      public boolean isDebugging() {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 51eac8b7177db66c005e4eaca689cf96d10edeaa..4f55f04812fe0306acfc4be45189f1f679e18e63 100644
+index 32d5d085721a6b9c539b261a2249f6206d0f8a87..ff279901038dfbed6a0b51cc5355ccd17efc6883 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -400,7 +400,34 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -399,7 +399,34 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          return this.getProperties().allowNether;
      }
  
diff --git a/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
index 073f6932ba..21f3c95d59 100644
--- a/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
+++ b/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bea4e947577ee2f5fd680eb932409283f8504ee7..b9a49f92e38daf4f80b6d3bf465eb9d249606976 100644
+index f46ae930c6d1609dbefb56e67853f6e8504b749f..787f32156b02063adf6426b7430da4c4956b759c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1458,7 +1458,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1457,7 +1457,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
diff --git a/patches/server/0029-Add-version-history-to-version-command.patch b/patches/server/0029-Add-version-history-to-version-command.patch
index da126164b8..9c0a186f60 100644
--- a/patches/server/0029-Add-version-history-to-version-command.patch
+++ b/patches/server/0029-Add-version-history-to-version-command.patch
@@ -201,7 +201,7 @@ index 0000000000000000000000000000000000000000..aac3f66cb23d260729c2a48d8710a9de
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 4f55f04812fe0306acfc4be45189f1f679e18e63..049f7dc31576980007eb8f0caab926bb58fead78 100644
+index ff279901038dfbed6a0b51cc5355ccd17efc6883..2c2d492fdfafb1d2e4e962e6818bd9d7466347d5 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -189,6 +189,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0031-Further-improve-server-tick-loop.patch b/patches/server/0031-Further-improve-server-tick-loop.patch
index 337c022360..7f3f22f5ed 100644
--- a/patches/server/0031-Further-improve-server-tick-loop.patch
+++ b/patches/server/0031-Further-improve-server-tick-loop.patch
@@ -12,19 +12,19 @@ Previous implementation did not calculate TPS correctly.
 Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b9a49f92e38daf4f80b6d3bf465eb9d249606976..71c8bb318b2e99b7d0b91196ac0b1b5bfbc8bc79 100644
+index 787f32156b02063adf6426b7430da4c4956b759c..be23196f7bf439c54218debb517dd3f37f6dea6f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -283,7 +283,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -282,7 +282,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     public OptionSet options;
      public org.bukkit.command.ConsoleCommandSender console;
-     public org.bukkit.command.RemoteConsoleCommandSender remoteConsole;
      public ConsoleReader reader;
 -    public static int currentTick = (int) (System.currentTimeMillis() / 50);
 +    public static int currentTick = 0; // Paper - Further improve tick loop
      public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
      public int autosavePeriod;
      public Commands vanillaCommandDispatcher;
-@@ -292,7 +292,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -291,7 +291,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      // Spigot start
      public static final int TPS = 20;
      public static final int TICK_TIME = 1000000000 / MinecraftServer.TPS;
@@ -33,7 +33,7 @@ index b9a49f92e38daf4f80b6d3bf465eb9d249606976..71c8bb318b2e99b7d0b91196ac0b1b5b
      public final double[] recentTps = new double[ 3 ];
      // Spigot end
      public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations;
-@@ -952,6 +952,57 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -951,6 +951,57 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      {
          return ( avg * exp ) + ( tps * ( 1 - exp ) );
      }
@@ -91,7 +91,7 @@ index b9a49f92e38daf4f80b6d3bf465eb9d249606976..71c8bb318b2e99b7d0b91196ac0b1b5b
      // Spigot End
  
      public static volatile RuntimeException chunkSystemCrash; // Paper - rewrite chunk system
-@@ -968,7 +1019,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -967,7 +1018,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
              // Spigot start
              Arrays.fill( recentTps, 20 );
@@ -101,7 +101,7 @@ index b9a49f92e38daf4f80b6d3bf465eb9d249606976..71c8bb318b2e99b7d0b91196ac0b1b5b
              while (this.running) {
                  // Paper start - rewrite chunk system
                  // guarantee that nothing can stop the server from halting if it can at least still tick
-@@ -976,7 +1028,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -975,7 +1027,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      throw this.chunkSystemCrash;
                  }
                  // Paper end - rewrite chunk system
@@ -110,7 +110,7 @@ index b9a49f92e38daf4f80b6d3bf465eb9d249606976..71c8bb318b2e99b7d0b91196ac0b1b5b
  
                  if (i > 5000L && this.nextTickTime - this.lastOverloadWarning >= 30000L) { // CraftBukkit
                      long j = i / 50L;
-@@ -988,12 +1040,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -987,12 +1039,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  }
  
                  ++MinecraftServer.currentTickLong; // Paper
@@ -134,7 +134,7 @@ index b9a49f92e38daf4f80b6d3bf465eb9d249606976..71c8bb318b2e99b7d0b91196ac0b1b5b
                      tickSection = curTime;
                  }
                  // Spigot end
-@@ -1003,7 +1061,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1002,7 +1060,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      this.debugCommandProfiler = new MinecraftServer.TimeProfiler(Util.getNanos(), this.tickCount);
                  }
  
diff --git a/patches/server/0040-Optimize-explosions.patch b/patches/server/0040-Optimize-explosions.patch
index 2e4e74b96a..82db2602a5 100644
--- a/patches/server/0040-Optimize-explosions.patch
+++ b/patches/server/0040-Optimize-explosions.patch
@@ -10,10 +10,10 @@ This patch adds a per-tick cache that is used for storing and retrieving
 an entity's exposure during an explosion.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 71c8bb318b2e99b7d0b91196ac0b1b5bfbc8bc79..3ff9a5a8f4b9a91958f6d846a7a5337a01dbb803 100644
+index be23196f7bf439c54218debb517dd3f37f6dea6f..ebfc20247ac5a548e6616a099b8885db9c7a8d25 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1404,6 +1404,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1403,6 +1403,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
              this.profiler.pop();
              this.profiler.pop();
diff --git a/patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
index d2397e8813..8ee08884de 100644
--- a/patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener
 Saves on some object allocation and processing when no plugin listens to this
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3ff9a5a8f4b9a91958f6d846a7a5337a01dbb803..1af6a1ed4111e5e1feaede68be2783070ed90c76 100644
+index ebfc20247ac5a548e6616a099b8885db9c7a8d25..4b9de3ca81b60eb4a916006cdfbc2a630a390a39 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1365,6 +1365,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1364,6 +1364,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
diff --git a/patches/server/0088-Configurable-Player-Collision.patch b/patches/server/0088-Configurable-Player-Collision.patch
index 39f2157ed5..7e60015bf1 100644
--- a/patches/server/0088-Configurable-Player-Collision.patch
+++ b/patches/server/0088-Configurable-Player-Collision.patch
@@ -18,10 +18,10 @@ index 1294b38262505b0d54089e428df9b363219de1f0..ee37ec0de1ca969144824427ae42b0c8
              buf.writeComponent(this.playerPrefix);
              buf.writeComponent(this.playerSuffix);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1af6a1ed4111e5e1feaede68be2783070ed90c76..010d0192da65e4dfe5516126b522d30b776394c0 100644
+index 4b9de3ca81b60eb4a916006cdfbc2a630a390a39..bb8546e5f7f223cb499ab404845aba524726ea16 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -587,6 +587,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -586,6 +586,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(worldserver.getWorld()));
          }
  
diff --git a/patches/server/0093-remove-null-possibility-for-getServer-singleton.patch b/patches/server/0093-remove-null-possibility-for-getServer-singleton.patch
index 6bb6d8878f..687b36c453 100644
--- a/patches/server/0093-remove-null-possibility-for-getServer-singleton.patch
+++ b/patches/server/0093-remove-null-possibility-for-getServer-singleton.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton
 to stop IDE complaining about potential NPE
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 010d0192da65e4dfe5516126b522d30b776394c0..c09ac4ef459c8df6c8623de7fbb63f8c2558bd2d 100644
+index bb8546e5f7f223cb499ab404845aba524726ea16..0ee486f807d7c44e2252c4c744e29b506d916d9c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -193,6 +193,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
@@ -17,7 +17,7 @@ index 010d0192da65e4dfe5516126b522d30b776394c0..c09ac4ef459c8df6c8623de7fbb63f8c
      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
      public static final String VANILLA_BRAND = "vanilla";
-@@ -320,6 +321,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -319,6 +320,7 @@ 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");
@@ -25,7 +25,7 @@ index 010d0192da65e4dfe5516126b522d30b776394c0..c09ac4ef459c8df6c8623de7fbb63f8c
          this.metricsRecorder = InactiveMetricsRecorder.INSTANCE;
          this.profiler = this.metricsRecorder.getProfiler();
          this.onMetricsRecordingStopped = (methodprofilerresults) -> {
-@@ -2324,9 +2326,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2323,9 +2325,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return false;
      }
  
diff --git a/patches/server/0098-Async-GameProfileCache-saving.patch b/patches/server/0098-Async-GameProfileCache-saving.patch
index f199705495..672588a1c4 100644
--- a/patches/server/0098-Async-GameProfileCache-saving.patch
+++ b/patches/server/0098-Async-GameProfileCache-saving.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Async GameProfileCache saving
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c09ac4ef459c8df6c8623de7fbb63f8c2558bd2d..006289473c03c8484b26264c61eaf6a5e73658c0 100644
+index 0ee486f807d7c44e2252c4c744e29b506d916d9c..b5ededfb23980abca01ef25207cca95ad390a70d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -933,7 +933,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -932,7 +932,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          } catch (java.lang.InterruptedException ignored) {} // Paper
          if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) {
              MinecraftServer.LOGGER.info("Saving usercache.json");
@@ -18,7 +18,7 @@ index c09ac4ef459c8df6c8623de7fbb63f8c2558bd2d..006289473c03c8484b26264c61eaf6a5
          // Spigot end
          io.papermc.paper.chunk.system.io.RegionFileIOThread.close(true); // Paper // Paper - rewrite chunk system
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 049f7dc31576980007eb8f0caab926bb58fead78..81a0a897a1fd2a408bfe43f24ed5e5f4bbefe161 100644
+index 2c2d492fdfafb1d2e4e962e6818bd9d7466347d5..131de2ca246cfbe4cb253e74cb05a73efbbcca73 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -242,7 +242,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch b/patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch
index 737dc557e9..ccf39e1b83 100644
--- a/patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch
@@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result
 in corruption/dataloss.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 006289473c03c8484b26264c61eaf6a5e73658c0..72161fef4ff8a469e028d136f71dda86e6220d0a 100644
+index b5ededfb23980abca01ef25207cca95ad390a70d..5abde8722e22e074d4ef44956f7bb5344441e174 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -237,6 +237,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -41,7 +41,7 @@ index 006289473c03c8484b26264c61eaf6a5e73658c0..72161fef4ff8a469e028d136f71dda86
      private boolean stopped;
      private int tickCount;
      protected final Proxy proxy;
-@@ -901,7 +902,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -900,7 +901,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (this.playerList != null) {
              MinecraftServer.LOGGER.info("Saving players");
              this.playerList.saveAll();
@@ -50,7 +50,7 @@ index 006289473c03c8484b26264c61eaf6a5e73658c0..72161fef4ff8a469e028d136f71dda86
              try { Thread.sleep(100); } catch (InterruptedException ex) {} // CraftBukkit - SPIGOT-625 - give server at least a chance to send packets
          }
  
-@@ -952,6 +953,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -951,6 +952,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void halt(boolean waitForShutdown) {
diff --git a/patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch
index 4a6fe9c6d3..5cea2d8fd8 100644
--- a/patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/0133-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -252,7 +252,7 @@ index c3631efda9c7fa531a8a9f18fbee7b5f8655382b..769f6489632302627fa1730cc08e77f5
      }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 72161fef4ff8a469e028d136f71dda86e6220d0a..a6d6652fab0dcb490b4229cbf6a7a63112cbfa26 100644
+index 5abde8722e22e074d4ef44956f7bb5344441e174..bb1280569181e8e3acb78ef622b4d2f905007222 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -165,7 +165,7 @@ import com.mojang.datafixers.util.Pair;
@@ -264,16 +264,16 @@ index 72161fef4ff8a469e028d136f71dda86e6220d0a..a6d6652fab0dcb490b4229cbf6a7a631
  import joptsimple.OptionSet;
  import net.minecraft.core.HolderLookup;
  import net.minecraft.resources.RegistryOps;
-@@ -284,7 +284,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -283,7 +283,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     public org.bukkit.craftbukkit.CraftServer server;
      public OptionSet options;
      public org.bukkit.command.ConsoleCommandSender console;
-     public org.bukkit.command.RemoteConsoleCommandSender remoteConsole;
 -    public ConsoleReader reader;
 +    //public ConsoleReader reader; // Paper
      public static int currentTick = 0; // Paper - Further improve tick loop
      public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
      public int autosavePeriod;
-@@ -368,7 +368,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -367,7 +367,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.options = options;
          this.worldLoader = worldLoader;
          this.vanillaCommandDispatcher = worldstem.dataPackResources().commands; // CraftBukkit
@@ -283,7 +283,7 @@ index 72161fef4ff8a469e028d136f71dda86e6220d0a..a6d6652fab0dcb490b4229cbf6a7a631
          if (System.console() == null && System.getProperty("jline.terminal") == null) {
              System.setProperty("jline.terminal", "jline.UnsupportedTerminal");
              Main.useJline = false;
-@@ -389,6 +391,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -388,6 +390,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  MinecraftServer.LOGGER.warn((String) null, ex);
              }
          }
@@ -292,7 +292,7 @@ index 72161fef4ff8a469e028d136f71dda86e6220d0a..a6d6652fab0dcb490b4229cbf6a7a631
          Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
          this.paperConfigurations = services.paperConfigurations(); // Paper
      }
-@@ -1133,7 +1137,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1132,7 +1136,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  org.spigotmc.WatchdogThread.doStop(); // Spigot
                  // CraftBukkit start - Restore terminal to original settings
                  try {
@@ -301,7 +301,7 @@ index 72161fef4ff8a469e028d136f71dda86e6220d0a..a6d6652fab0dcb490b4229cbf6a7a631
                  } catch (Exception ignored) {
                  }
                  // CraftBukkit end
-@@ -1587,7 +1591,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1586,7 +1590,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @Override
      public void sendSystemMessage(Component message) {
@@ -311,7 +311,7 @@ index 72161fef4ff8a469e028d136f71dda86e6220d0a..a6d6652fab0dcb490b4229cbf6a7a631
  
      public KeyPair getKeyPair() {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 81a0a897a1fd2a408bfe43f24ed5e5f4bbefe161..24f62f9c4d288297d7a324e806745cc1449d7b4c 100644
+index 131de2ca246cfbe4cb253e74cb05a73efbbcca73..72639f33b6503faede1ec0df48d7c6a88b7eb82f 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -98,6 +98,9 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0179-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0179-Implement-extended-PaperServerListPingEvent.patch
index da614a11a7..e8838b5561 100644
--- a/patches/server/0179-Implement-extended-PaperServerListPingEvent.patch
+++ b/patches/server/0179-Implement-extended-PaperServerListPingEvent.patch
@@ -181,7 +181,7 @@ index 0000000000000000000000000000000000000000..6b0bdc266109cdfb874f08bf74323603
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a6d6652fab0dcb490b4229cbf6a7a63112cbfa26..010318abbb6fadbadade8926793786eced6775d3 100644
+index bb1280569181e8e3acb78ef622b4d2f905007222..9f59ef54ef6f6af8b0fef8567d8cfbefb64bc29f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -3,6 +3,9 @@ package net.minecraft.server;
@@ -194,7 +194,7 @@ index a6d6652fab0dcb490b4229cbf6a7a63112cbfa26..010318abbb6fadbadade8926793786ec
  import com.google.common.collect.Lists;
  import com.google.common.collect.Maps;
  import com.google.common.collect.Sets;
-@@ -1345,7 +1348,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1344,7 +1347,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (this.hidesOnlinePlayers()) {
              return new ServerStatus.Players(i, list.size(), List.of());
          } else {
diff --git a/patches/server/0236-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0236-Add-Early-Warning-Feature-to-WatchDog.patch
index b6200046c0..8fc8763dbc 100644
--- a/patches/server/0236-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/server/0236-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -9,10 +9,10 @@ thread dumps at an interval until the point of crash.
 This will help diagnose what was going on in that time before the crash.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 010318abbb6fadbadade8926793786eced6775d3..9cd0e389deda8d0bc7a551ff9e8b6bcd51184476 100644
+index 9f59ef54ef6f6af8b0fef8567d8cfbefb64bc29f..d05f776204a720084a583c6d6dfe47936761b6e3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1048,6 +1048,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1047,6 +1047,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.status = this.buildServerStatus();
  
              // Spigot start
@@ -21,7 +21,7 @@ index 010318abbb6fadbadade8926793786eced6775d3..9cd0e389deda8d0bc7a551ff9e8b6bcd
              long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
              lastTick = start - TICK_TIME; // Paper
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 24f62f9c4d288297d7a324e806745cc1449d7b4c..29eadf85e11c2261218fa406b29455da50400a7a 100644
+index 72639f33b6503faede1ec0df48d7c6a88b7eb82f..7533dc44c782b4e31b3823458998bc72739e94b2 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -197,6 +197,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0238-Use-a-Queue-for-Queueing-Commands.patch b/patches/server/0238-Use-a-Queue-for-Queueing-Commands.patch
index 9bffb4a987..bacb924338 100644
--- a/patches/server/0238-Use-a-Queue-for-Queueing-Commands.patch
+++ b/patches/server/0238-Use-a-Queue-for-Queueing-Commands.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Queue for Queueing Commands
 Lists are bad as Queues mmmkay.
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 29eadf85e11c2261218fa406b29455da50400a7a..c2f5d3153591d48c6c2afdec049a7b390066bfdb 100644
+index 7533dc44c782b4e31b3823458998bc72739e94b2..ea0d1faa0e27cd7a1b793ad93ba2ef1e6bf71628 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -69,7 +69,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -17,8 +17,8 @@ index 29eadf85e11c2261218fa406b29455da50400a7a..c2f5d3153591d48c6c2afdec049a7b39
 +    private final java.util.Queue<ConsoleInput> serverCommandQueue = new java.util.concurrent.ConcurrentLinkedQueue<>(); // Paper - use a proper queuemmands
      @Nullable
      private QueryThreadGs4 queryThreadGs4;
-     public final RconConsoleSource rconConsoleSource;
-@@ -440,13 +440,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+     // public final RemoteControlCommandListener rconConsoleSource; // CraftBukkit - remove field
+@@ -439,13 +439,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              return;
          }
          // Paper end - rewrite chunk system
diff --git a/patches/server/0275-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0275-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index df78284367..518734b0a5 100644
--- a/patches/server/0275-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/patches/server/0275-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
@@ -79,10 +79,10 @@ index 0f05d26248d8c999048a88796df227a6a1e3755f..7354711e194ab58b11b68f447c1fc795
          return executorService;
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9cd0e389deda8d0bc7a551ff9e8b6bcd51184476..3289e2ec79c760ba8c1c47ed1baaba136682d8e8 100644
+index d05f776204a720084a583c6d6dfe47936761b6e3..e5ab15722fe640d4766b9a24fb82b1d60f15a241 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -312,6 +312,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -311,6 +311,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          thread.setUncaughtExceptionHandler((thread1, throwable) -> {
              MinecraftServer.LOGGER.error("Uncaught exception in server thread", throwable);
          });
diff --git a/patches/server/0276-Optimize-World-Time-Updates.patch b/patches/server/0276-Optimize-World-Time-Updates.patch
index 66909f687a..d542189ef4 100644
--- a/patches/server/0276-Optimize-World-Time-Updates.patch
+++ b/patches/server/0276-Optimize-World-Time-Updates.patch
@@ -8,10 +8,10 @@ the updates per world, so that we can re-use the same packet
 object for every player unless they have per-player time enabled.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ed66f20b38fb6cea0dab020d8ffdde894da86113..41181620a9fb8f9e5a8d5211d88fcb0c3063f42c 100644
+index e5ab15722fe640d4766b9a24fb82b1d60f15a241..1a74b7c252d16e5ab2c303e6e96c62e78ef9311c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1387,12 +1387,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1386,12 +1386,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          MinecraftTimings.timeUpdateTimer.startTiming(); // Spigot // Paper
          // Send time updates to everyone, it will get the right time from the world the player is in.
diff --git a/patches/server/0293-Async-command-map-building.patch b/patches/server/0293-Async-command-map-building.patch
index 326a92278b..84b09041b8 100644
--- a/patches/server/0293-Async-command-map-building.patch
+++ b/patches/server/0293-Async-command-map-building.patch
@@ -53,10 +53,10 @@ index e3394864e29357fec036f9e616472aeab95d035e..b7f1569c662df13f278fc704cabec040
          event.getPlayer().getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 41181620a9fb8f9e5a8d5211d88fcb0c3063f42c..ef74bacd74cfef198c404293f9a13073fe3d5c66 100644
+index 1a74b7c252d16e5ab2c303e6e96c62e78ef9311c..d84ed437e91a620c294533ddcb098cc11bc16c1f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -896,6 +896,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -895,6 +895,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
  
          MinecraftServer.LOGGER.info("Stopping server");
diff --git a/patches/server/0304-Server-Tick-Events.patch b/patches/server/0304-Server-Tick-Events.patch
index b98bced041..5da18cda5f 100644
--- a/patches/server/0304-Server-Tick-Events.patch
+++ b/patches/server/0304-Server-Tick-Events.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Server Tick Events
 Fires event at start and end of a server tick
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ef74bacd74cfef198c404293f9a13073fe3d5c66..95c2be1ee4bca53c9ea78e3a32aaf3a6395381a7 100644
+index d84ed437e91a620c294533ddcb098cc11bc16c1f..78465f82b2f3ae2a932b787a489f3d01cc51f5f9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1305,6 +1305,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1304,6 +1304,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          });
          isOversleep = false;MinecraftTimings.serverOversleep.stopTiming();
          // Paper end
@@ -17,7 +17,7 @@ index ef74bacd74cfef198c404293f9a13073fe3d5c66..95c2be1ee4bca53c9ea78e3a32aaf3a6
  
          ++this.tickCount;
          this.tickChildren(shouldKeepTicking);
-@@ -1326,6 +1327,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1325,6 +1326,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.runAllTasks();
          }
          // Paper end
diff --git a/patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 20ed1d5897..b5af090c02 100644
--- a/patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/patches/server/0312-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 95c2be1ee4bca53c9ea78e3a32aaf3a6395381a7..cd57953e31c1f0f51553be113d84760f24b061b0 100644
+index 78465f82b2f3ae2a932b787a489f3d01cc51f5f9..21d7196cdc694a581c8a3232a39e7454c0b30f56 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -738,30 +738,33 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -737,30 +737,33 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      // CraftBukkit start
      public void prepareLevels(ChunkProgressListener worldloadlistener, ServerLevel worldserver) {
@@ -53,7 +53,7 @@ index 95c2be1ee4bca53c9ea78e3a32aaf3a6395381a7..cd57953e31c1f0f51553be113d84760f
  
          if (true) {
              ServerLevel worldserver1 = worldserver;
-@@ -784,7 +787,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -783,7 +786,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // this.nextTickTime = SystemUtils.getMillis() + 10L;
          this.executeModerately();
          // CraftBukkit end
diff --git a/patches/server/0358-Add-tick-times-API-and-mspt-command.patch b/patches/server/0358-Add-tick-times-API-and-mspt-command.patch
index 1b6a0d57fc..f941d28971 100644
--- a/patches/server/0358-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0358-Add-tick-times-API-and-mspt-command.patch
@@ -125,7 +125,7 @@ index d44d0074446c1c54e87dc8078dff7fef1d92f343..bbb8b1933ef33a3b91f69545f69dd3cf
  
      public static void registerCommands(final MinecraftServer server) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cd57953e31c1f0f51553be113d84760f24b061b0..36112a1ab7306deb3cc38b103f22f7c1b8f89206 100644
+index 21d7196cdc694a581c8a3232a39e7454c0b30f56..498f06aa1d8b2c20f5bf31d6751f08cf1eb4240f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -251,6 +251,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -140,7 +140,7 @@ index cd57953e31c1f0f51553be113d84760f24b061b0..36112a1ab7306deb3cc38b103f22f7c1
      @Nullable
      private KeyPair keyPair;
      @Nullable
-@@ -1341,6 +1346,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1340,6 +1345,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.averageTickTime = this.averageTickTime * 0.8F + (float) j / 1000000.0F * 0.19999999F;
          long k = Util.getNanos();
  
@@ -152,7 +152,7 @@ index cd57953e31c1f0f51553be113d84760f24b061b0..36112a1ab7306deb3cc38b103f22f7c1
          this.frameTimer.logFrameDuration(k - i);
          this.profiler.pop();
          org.spigotmc.WatchdogThread.tick(); // Spigot
-@@ -2571,4 +2581,30 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2570,4 +2580,30 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public static record ServerResourcePackInfo(String url, String hash, boolean isRequired, @Nullable Component prompt) {
  
      }
diff --git a/patches/server/0362-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0362-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index f9b75a0b9d..eb91c14989 100644
--- a/patches/server/0362-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/server/0362-Remote-Connections-shouldn-t-hold-up-shutdown.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Remote Connections shouldn't hold up shutdown
 Bugs in the connection logic appears to leave stale connections even, preventing shutdown
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index c2f5d3153591d48c6c2afdec049a7b390066bfdb..aa1622fb3ea1f349b539e09c811de0f297a86076 100644
+index ea0d1faa0e27cd7a1b793ad93ba2ef1e6bf71628..4d7b0646bed201a47a3fee9a540c9a11e2844e09 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -391,11 +391,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -390,11 +390,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
          }
  
          if (this.rconThread != null) {
diff --git a/patches/server/0370-Improved-Watchdog-Support.patch b/patches/server/0370-Improved-Watchdog-Support.patch
index cb6c54fefb..e20f0553aa 100644
--- a/patches/server/0370-Improved-Watchdog-Support.patch
+++ b/patches/server/0370-Improved-Watchdog-Support.patch
@@ -71,10 +71,10 @@ index 336795dff742b7c6957fbd3476aff31d25a5e659..30a58229aa6dac5039511d0c0df5f291
              cause = cause.getCause();
          }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 36112a1ab7306deb3cc38b103f22f7c1b8f89206..e658f17f04f0e4e541353bf59411788f9da9a780 100644
+index 498f06aa1d8b2c20f5bf31d6751f08cf1eb4240f..047562e1df93347f629b529ca0647697e22ecf48 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -297,7 +297,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -296,7 +296,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
      public int autosavePeriod;
      public Commands vanillaCommandDispatcher;
@@ -83,7 +83,7 @@ index 36112a1ab7306deb3cc38b103f22f7c1b8f89206..e658f17f04f0e4e541353bf59411788f
      // CraftBukkit end
      // Spigot start
      public static final int TPS = 20;
-@@ -308,6 +308,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -307,6 +307,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations;
      public static long currentTickLong = 0L; // Paper
  
@@ -93,7 +93,7 @@ index 36112a1ab7306deb3cc38b103f22f7c1b8f89206..e658f17f04f0e4e541353bf59411788f
      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
-@@ -884,6 +887,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -883,6 +886,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      // CraftBukkit start
      private boolean hasStopped = false;
@@ -101,7 +101,7 @@ index 36112a1ab7306deb3cc38b103f22f7c1b8f89206..e658f17f04f0e4e541353bf59411788f
      private final Object stopLock = new Object();
      public final boolean hasStopped() {
          synchronized (this.stopLock) {
-@@ -898,6 +902,19 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -897,6 +901,19 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              if (this.hasStopped) return;
              this.hasStopped = true;
          }
@@ -121,7 +121,7 @@ index 36112a1ab7306deb3cc38b103f22f7c1b8f89206..e658f17f04f0e4e541353bf59411788f
          // CraftBukkit end
          if (this.metricsRecorder.isRecording()) {
              this.cancelRecordingMetrics();
-@@ -954,7 +971,19 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -953,7 +970,19 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.getProfileCache().save(false); // Paper
          }
          // Spigot end
@@ -141,7 +141,7 @@ index 36112a1ab7306deb3cc38b103f22f7c1b8f89206..e658f17f04f0e4e541353bf59411788f
      }
  
      public String getLocalIp() {
-@@ -1049,6 +1078,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1048,6 +1077,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      protected void runServer() {
          try {
@@ -149,7 +149,7 @@ index 36112a1ab7306deb3cc38b103f22f7c1b8f89206..e658f17f04f0e4e541353bf59411788f
              if (!this.initServer()) {
                  throw new IllegalStateException("Failed to initialize server");
              }
-@@ -1058,6 +1088,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1057,6 +1087,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.status = this.buildServerStatus();
  
              // Spigot start
@@ -168,7 +168,7 @@ index 36112a1ab7306deb3cc38b103f22f7c1b8f89206..e658f17f04f0e4e541353bf59411788f
              org.spigotmc.WatchdogThread.hasStarted = true; // Paper
              Arrays.fill( recentTps, 20 );
              long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
-@@ -1118,6 +1160,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1117,6 +1159,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  JvmProfiler.INSTANCE.onServerTick(this.averageTickTime);
              }
          } catch (Throwable throwable) {
@@ -181,7 +181,7 @@ index 36112a1ab7306deb3cc38b103f22f7c1b8f89206..e658f17f04f0e4e541353bf59411788f
              MinecraftServer.LOGGER.error("Encountered an unexpected exception", throwable);
              // Spigot Start
              if ( throwable.getCause() != null )
-@@ -1148,14 +1196,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1147,14 +1195,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      this.services.profileCache().clearExecutor();
                  }
  
@@ -199,7 +199,7 @@ index 36112a1ab7306deb3cc38b103f22f7c1b8f89206..e658f17f04f0e4e541353bf59411788f
              }
  
          }
-@@ -1224,6 +1272,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1223,6 +1271,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @Override
      public TickTask wrapRunnable(Runnable runnable) {
@@ -212,7 +212,7 @@ index 36112a1ab7306deb3cc38b103f22f7c1b8f89206..e658f17f04f0e4e541353bf59411788f
          return new TickTask(this.tickCount, runnable);
      }
  
-@@ -1459,6 +1513,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1458,6 +1512,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  try {
                      crashreport = CrashReport.forThrowable(throwable, "Exception ticking world");
                  } catch (Throwable t) {
@@ -220,7 +220,7 @@ index 36112a1ab7306deb3cc38b103f22f7c1b8f89206..e658f17f04f0e4e541353bf59411788f
                      throw new RuntimeException("Error generating crash report", t);
                  }
                  // Spigot End
-@@ -1959,7 +2014,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1958,7 +2013,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
              this.worldData.setDataConfiguration(worlddataconfiguration);
              this.resources.managers.updateRegistryTags(this.registryAccess());
@@ -238,7 +238,7 @@ index 36112a1ab7306deb3cc38b103f22f7c1b8f89206..e658f17f04f0e4e541353bf59411788f
              this.functionManager.replaceLibrary(this.resources.managers.getFunctionLibrary());
              this.structureTemplateManager.onResourceManagerReload(this.resources.resourceManager);
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index aa1622fb3ea1f349b539e09c811de0f297a86076..aaad6b0de19872c6e54591adf90c30d2c2ed5223 100644
+index 4d7b0646bed201a47a3fee9a540c9a11e2844e09..a0b85718f5c2334673290090f343ce218639bcbb 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -269,7 +269,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -250,7 +250,7 @@ index aa1622fb3ea1f349b539e09c811de0f297a86076..aaad6b0de19872c6e54591adf90c30d2
              if (dedicatedserverproperties.announcePlayerAchievements != null) {
                  ((GameRules.BooleanValue) this.getGameRules().getRule(GameRules.RULE_ANNOUNCE_ADVANCEMENTS)).set(dedicatedserverproperties.announcePlayerAchievements, this);
              }
-@@ -398,7 +398,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -397,7 +397,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
              // this.remoteStatusListener.stop(); // Paper - don't wait for remote connections
          }
  
@@ -260,7 +260,7 @@ index aa1622fb3ea1f349b539e09c811de0f297a86076..aaad6b0de19872c6e54591adf90c30d2
      }
  
      @Override
-@@ -763,7 +764,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -770,7 +771,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
      @Override
      public void stopServer() {
          super.stopServer();
@@ -319,7 +319,7 @@ index c3760f22fcc56ccb25e3315823054416c2172386..246606164117e8140ab0892ec1326503
                          final String msg = String.format("BlockEntity threw exception at %s:%s,%s,%s", LevelChunk.this.getLevel().getWorld().getName(), this.getPos().getX(), this.getPos().getY(), this.getPos().getZ());
                          net.minecraft.server.MinecraftServer.LOGGER.error(msg, throwable);
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 1dc2c4552df65c355d8711b2a492c307d29180e3..645cbf447fd1b77cbd1ae3e35ed47aebbd52e27e 100644
+index 77911e26af9ec468c8a0c1fe8161b79c67b2303c..be1fbe64a5145b25c111ba3b6bb35109e77deb9d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -178,6 +178,36 @@ public class Main {
diff --git a/patches/server/0389-misc-debugging-dumps.patch b/patches/server/0389-misc-debugging-dumps.patch
index bd189e26bd..e38c098e30 100644
--- a/patches/server/0389-misc-debugging-dumps.patch
+++ b/patches/server/0389-misc-debugging-dumps.patch
@@ -29,10 +29,10 @@ index 0000000000000000000000000000000000000000..2d5494d2813b773e60ddba6790b750a9
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e658f17f04f0e4e541353bf59411788f9da9a780..f4ad35b55cacd5c1c3e4d81d4a9cf9675349ce79 100644
+index 047562e1df93347f629b529ca0647697e22ecf48..8b1a92c1a0e9505ebc11de0e6b54b48343ef8e60 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -888,6 +888,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -887,6 +887,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      // CraftBukkit start
      private boolean hasStopped = false;
      public volatile boolean hasFullyShutdown = false; // Paper
@@ -40,7 +40,7 @@ index e658f17f04f0e4e541353bf59411788f9da9a780..f4ad35b55cacd5c1c3e4d81d4a9cf967
      private final Object stopLock = new Object();
      public final boolean hasStopped() {
          synchronized (this.stopLock) {
-@@ -902,6 +903,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -901,6 +902,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              if (this.hasStopped) return;
              this.hasStopped = true;
          }
@@ -48,7 +48,7 @@ index e658f17f04f0e4e541353bf59411788f9da9a780..f4ad35b55cacd5c1c3e4d81d4a9cf967
          // Paper start - kill main thread, and kill it hard
          shutdownThread = Thread.currentThread();
          org.spigotmc.WatchdogThread.doStop(); // Paper
-@@ -1004,6 +1006,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1003,6 +1005,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
      public void safeShutdown(boolean waitForShutdown, boolean isRestarting) {
          this.isRestarting = isRestarting;
diff --git a/patches/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
index 833cb34ac0..0391739528 100644
--- a/patches/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
+++ b/patches/server/0391-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 527e39bcd6aea7560b5d8ef37377c2f37da5c1ca..e2e7fe74095b83f2ac12f8054dd91b38ffcc32e7 100644
+index 6807a91d4d55dc90e2820caa855a44844c87b7e2..453691f34c400b074699f0f444ac28482837a9f7 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -37,6 +37,7 @@ dependencies {
@@ -524,7 +524,7 @@ index 99d5fd192a4cf1ac2739520a111b8dd854ff2f57..dc3dea801a673462e767ad37268ec77a
  
      protected void channelRead0(ChannelHandlerContext channelhandlercontext, Packet<?> packet) {
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index aaad6b0de19872c6e54591adf90c30d2c2ed5223..6a4c7783146ff6b6703e9ae814134a8d1086cf7f 100644
+index a0b85718f5c2334673290090f343ce218639bcbb..fff1f35b783bea3c2ea43c5d403ff57d96c2bf86 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -195,6 +195,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0399-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0399-Wait-for-Async-Tasks-during-shutdown.patch
index 77d4f566df..62eb5e0890 100644
--- a/patches/server/0399-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0399-Wait-for-Async-Tasks-during-shutdown.patch
@@ -10,10 +10,10 @@ Adds a 5 second grace period for any async tasks to finish and warns
 if any are still running after that delay just as reload does.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f4ad35b55cacd5c1c3e4d81d4a9cf9675349ce79..53876c0d957e2d151e93744eff60606096f02e66 100644
+index 8b1a92c1a0e9505ebc11de0e6b54b48343ef8e60..ccf238c12c416e2aa7ee83a14bbbb96f5b2f8b51 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -928,6 +928,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -927,6 +927,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // CraftBukkit start
          if (this.server != null) {
              this.server.disablePlugins();
diff --git a/patches/server/0404-Add-option-for-console-having-all-permissions.patch b/patches/server/0404-Add-option-for-console-having-all-permissions.patch
index d1e3317d94..8d4ac63012 100644
--- a/patches/server/0404-Add-option-for-console-having-all-permissions.patch
+++ b/patches/server/0404-Add-option-for-console-having-all-permissions.patch
@@ -25,10 +25,10 @@ index 324e6d1a4fadd3e557e4ba05f04e6a5891cc54df..4e56018b64d11f76c8da43fd8f85c6de
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/CraftRemoteConsoleCommandSender.java b/src/main/java/org/bukkit/craftbukkit/command/CraftRemoteConsoleCommandSender.java
-index a6612cc0ea87aeb8e87521ff7b5fe58c7b06b9ef..dfc15cfd897316f64a063b8ae93a0882ab5b3993 100644
+index ad731c5f76f19394866a121c64d4169ea8fb8cd7..55413cc3da415326b280ddbc0b4f4b201a301d5b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/CraftRemoteConsoleCommandSender.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/CraftRemoteConsoleCommandSender.java
-@@ -45,4 +45,16 @@ public class CraftRemoteConsoleCommandSender extends ServerCommandSender impleme
+@@ -55,4 +55,16 @@ public class CraftRemoteConsoleCommandSender extends ServerCommandSender impleme
      public void setOp(boolean value) {
          throw new UnsupportedOperationException("Cannot change operator status of remote controller.");
      }
diff --git a/patches/server/0420-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0420-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 4b55f2dc73..5f1b9a7528 100644
--- a/patches/server/0420-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0420-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -8,10 +8,10 @@ makes it so that the server keeps the last difficulty used instead
 of restoring the server.properties every single load.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7668cceb6dcf0eafbd00abb24deaefe9729d261a..d1555152399221947283a68c2054cf4a93377666 100644
+index ccf238c12c416e2aa7ee83a14bbbb96f5b2f8b51..c09adcb869edf273c633ce996b048173ded89703 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -798,7 +798,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -797,7 +797,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (worldserver.getWorld().getKeepSpawnInMemory()) worldloadlistener.stop(); // Paper
          // CraftBukkit start
          // this.updateMobSpawningFlags();
@@ -20,7 +20,7 @@ index 7668cceb6dcf0eafbd00abb24deaefe9729d261a..d1555152399221947283a68c2054cf4a
  
          this.forceTicks = false;
          // CraftBukkit end
-@@ -1726,11 +1726,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1725,11 +1725,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
      }
  
@@ -40,7 +40,7 @@ index 7668cceb6dcf0eafbd00abb24deaefe9729d261a..d1555152399221947283a68c2054cf4a
          }
      }
  
-@@ -1744,7 +1747,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1743,7 +1746,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
  
@@ -63,10 +63,10 @@ index 89be3991ef4fb2deb7276c5409cb571a7fb1f821..9c272f7cf8cbd2bbe147e57f7fabe135
                  return Component.translatable("commands.difficulty.success", difficulty.getDisplayName());
              }, true);
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 6a4c7783146ff6b6703e9ae814134a8d1086cf7f..1ffd3854239862414e6ceecf2764ba3d6bd7942a 100644
+index fff1f35b783bea3c2ea43c5d403ff57d96c2bf86..8f7916aa522fa2a49197d59e63d6e5c3a2d4bf42 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -326,7 +326,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -325,7 +325,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
  
      @Override
      public void forceDifficulty() {
@@ -89,7 +89,7 @@ index 15a70bad66eb2508f58ff184061c2d19e45297e1..f80645fe0e1f9ad2a70ea33c5dc6a8c0
  
                  playerlist.sendPlayerPermissionLevel(this);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 457c2b1e3db83c17c5282ad64eaccf3e534eafdb..6f3cd16845d5ea265666f5535b7f893e0a9d0fcf 100644
+index 61053ccdcf5e588164f243faa9ef6beda5bf45fc..2f0fb75a35a1fa45614621da9e24cec6e842b693 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3382,7 +3382,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
diff --git a/patches/server/0425-incremental-chunk-and-player-saving.patch b/patches/server/0425-incremental-chunk-and-player-saving.patch
index 391666870e..ae63b88dd9 100644
--- a/patches/server/0425-incremental-chunk-and-player-saving.patch
+++ b/patches/server/0425-incremental-chunk-and-player-saving.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] incremental chunk and player saving
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 53c0246acda9fe1242710260e250429ae51eceb8..56e98ea2964c2779537ac607b7c4677bc695d92a 100644
+index c09adcb869edf273c633ce996b048173ded89703..d62c09f7328af63112d9e6f1a06844047dbf6570 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -871,7 +871,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -870,7 +870,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          try {
              this.isSaving = true;
@@ -17,7 +17,7 @@ index 53c0246acda9fe1242710260e250429ae51eceb8..56e98ea2964c2779537ac607b7c4677b
              flag3 = this.saveAllChunks(suppressLogs, flush, force);
          } finally {
              this.isSaving = false;
-@@ -1381,13 +1381,28 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1380,13 +1380,28 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.status = this.buildServerStatus();
          }
  
@@ -115,7 +115,7 @@ index e96890be7f03b7cc846fe850d4169e09b5d40eab..02ba7e25c649832aba2e742cb76be9d2
          // Paper start - rewrite chunk system - add close param
          this.save(progressListener, flush, savingDisabled, false);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 2040b2defecb484ee7b46a885e924483387ee8fe..c22acc5e6333f8cc9b734bff48bb9ff7a00bfd4d 100644
+index f80645fe0e1f9ad2a70ea33c5dc6a8c02ff262ec..e087b62f88157d57eb037feb0d39c076b286f755 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -189,6 +189,7 @@ import org.bukkit.inventory.MainHand;
diff --git a/patches/server/0462-Cache-block-data-strings.patch b/patches/server/0462-Cache-block-data-strings.patch
index d706e7fb92..84607af12b 100644
--- a/patches/server/0462-Cache-block-data-strings.patch
+++ b/patches/server/0462-Cache-block-data-strings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Cache block data strings
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f704725928b0ec05ffff554901e7558ef8f308d6..1a8bc8d508202012130441397fe1a404fb1357fd 100644
+index d62c09f7328af63112d9e6f1a06844047dbf6570..a8fea134ddd8bf19abea977871c77cd317090145 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2049,6 +2049,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2048,6 +2048,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.getPlayerList().reloadResources();
              this.functionManager.replaceLibrary(this.resources.managers.getFunctionLibrary());
              this.structureTemplateManager.onResourceManagerReload(this.resources.resourceManager);
diff --git a/patches/server/0470-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0470-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 09f5a80190..87818b0d38 100644
--- a/patches/server/0470-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0470-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix deop kicking non-whitelisted player when white list is
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1a8bc8d508202012130441397fe1a404fb1357fd..8ca3bb41307f1f7ba1b1340981cc37e331fa9388 100644
+index a8fea134ddd8bf19abea977871c77cd317090145..8c9ebc501282e929503c39607048e032f05fbb9c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2132,13 +2132,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2131,13 +2131,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (this.isEnforceWhitelist()) {
              PlayerList playerlist = source.getServer().getPlayerList();
              UserWhiteList whitelist = playerlist.getWhiteList();
diff --git a/patches/server/0524-Added-ServerResourcesReloadedEvent.patch b/patches/server/0524-Added-ServerResourcesReloadedEvent.patch
index 2d4965470a..15bb8da191 100644
--- a/patches/server/0524-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0524-Added-ServerResourcesReloadedEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Added ServerResourcesReloadedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8ca3bb41307f1f7ba1b1340981cc37e331fa9388..676ec9a9b087f7f1e46a3dc3d967594c0cfbcd87 100644
+index 8c9ebc501282e929503c39607048e032f05fbb9c..892830b2d9a15a832040fbeac5fca3d011082c27 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2009,7 +2009,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2008,7 +2008,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return this.functionManager;
      }
  
@@ -22,7 +22,7 @@ index 8ca3bb41307f1f7ba1b1340981cc37e331fa9388..676ec9a9b087f7f1e46a3dc3d967594c
          RegistryAccess.Frozen iregistrycustom_dimension = this.registries.getAccessForLoading(RegistryLayer.RELOADABLE);
          CompletableFuture<Void> completablefuture = CompletableFuture.supplyAsync(() -> {
              Stream<String> stream = dataPacks.stream(); // CraftBukkit - decompile error
-@@ -2050,6 +2056,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2049,6 +2055,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.functionManager.replaceLibrary(this.resources.managers.getFunctionLibrary());
              this.structureTemplateManager.onResourceManagerReload(this.resources.resourceManager);
              org.bukkit.craftbukkit.block.data.CraftBlockData.reloadCache(); // Paper - cache block data strings, they can be defined by datapacks so refresh it here
diff --git a/patches/server/0548-EntityMoveEvent.patch b/patches/server/0548-EntityMoveEvent.patch
index 84cb2613cf..50d8310197 100644
--- a/patches/server/0548-EntityMoveEvent.patch
+++ b/patches/server/0548-EntityMoveEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] EntityMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 676ec9a9b087f7f1e46a3dc3d967594c0cfbcd87..5a4437f4244ad7243e82a231b0206910384e5db8 100644
+index 892830b2d9a15a832040fbeac5fca3d011082c27..d974b6c0f034722a0d2f143843c5a7b280883d5f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1504,6 +1504,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1503,6 +1503,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
              worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
diff --git a/patches/server/0560-fix-converting-txt-to-json-file.patch b/patches/server/0560-fix-converting-txt-to-json-file.patch
index a47425eac7..39028741de 100644
--- a/patches/server/0560-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0560-fix-converting-txt-to-json-file.patch
@@ -21,7 +21,7 @@ index a20d47f54f12dfc0a5f76dd969238e34c958b618..935dac757280731bfeb0a8f033cbe315
          this.saveUserBanList();
          this.loadIpBanList();
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 1ffd3854239862414e6ceecf2764ba3d6bd7942a..030b6e33fe80f6c50c473dbaa8f9aa9d4384a6b2 100644
+index 8f7916aa522fa2a49197d59e63d6e5c3a2d4bf42..89b6cbc3721cdd8000ae34c33dec1d4458cf55d3 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -198,6 +198,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0571-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0571-forced-whitelist-use-configurable-kick-message.patch
index 5588a9fe18..0df3f326fa 100644
--- a/patches/server/0571-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0571-forced-whitelist-use-configurable-kick-message.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] forced whitelist: use configurable kick message
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5a4437f4244ad7243e82a231b0206910384e5db8..974cb4108f11394d7b7dbb270cae93aefe4e5511 100644
+index d974b6c0f034722a0d2f143843c5a7b280883d5f..17e963f927c81dfb6bf10f621c76c6631fd2dd97 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2148,7 +2148,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2147,7 +2147,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  ServerPlayer entityplayer = (ServerPlayer) iterator.next();
  
                  if (!whitelist.isWhiteListed(entityplayer.getGameProfile()) && !this.getPlayerList().isOp(entityplayer.getGameProfile())) { // Paper - Fix kicking ops when whitelist is reloaded (MC-171420)
diff --git a/patches/server/0574-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0574-Enhance-console-tab-completions-for-brigadier-comman.patch
index 6671085bb6..b5c885d353 100644
--- a/patches/server/0574-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0574-Enhance-console-tab-completions-for-brigadier-comman.patch
@@ -208,7 +208,7 @@ index 0000000000000000000000000000000000000000..dd9d77d7c7f1a5a130a1f4c15e5b1e68
 +    public void setErrorIndex(final int errorIndex) {}
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 030b6e33fe80f6c50c473dbaa8f9aa9d4384a6b2..3f230a32346d6923a9fe4c2311142fbf4b088373 100644
+index 89b6cbc3721cdd8000ae34c33dec1d4458cf55d3..3acdac903ec7afb034f86d725ca0dc949babd1fc 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -173,7 +173,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0587-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0587-Implement-methods-to-convert-between-Component-and-B.patch
index 65beeb5f10..97e6dec387 100644
--- a/patches/server/0587-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0587-Implement-methods-to-convert-between-Component-and-B.patch
@@ -42,7 +42,7 @@ index 0000000000000000000000000000000000000000..dd6012b6a097575b2d1471be5069ecce
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 3f230a32346d6923a9fe4c2311142fbf4b088373..75c0ea2a59963334555efa1af03693fdff0fac32 100644
+index 3acdac903ec7afb034f86d725ca0dc949babd1fc..60d5142f17c561fd7268999faaa084642abbb65c 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -209,6 +209,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0606-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0606-Fix-and-optimise-world-force-upgrading.patch
index 5b70a6d729..bce854768c 100644
--- a/patches/server/0606-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0606-Fix-and-optimise-world-force-upgrading.patch
@@ -275,10 +275,10 @@ index 98385550084c9f975e494668961bac6ccb0700ab..1147044f2c4c2e9510cb6e5c38b6abe8
          Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit
          WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, dimensionOptionsRegistry, eraseCache);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 974cb4108f11394d7b7dbb270cae93aefe4e5511..8843939070d4155ef3457a90548cee1f19debb2f 100644
+index 17e963f927c81dfb6bf10f621c76c6631fd2dd97..3054716dda1fcfe6c457d81dd89c82bf6acc64a3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -552,11 +552,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -551,11 +551,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  worlddata = new PrimaryLevelData(worldsettings, worldoptions, worlddimensions_b.specialWorldProperty(), lifecycle);
              }
              worlddata.checkName(name); // CraftBukkit - Migration did not rewrite the level.dat; This forces 1.8 to take the last loaded world as respawn (in this case the end)
@@ -291,7 +291,7 @@ index 974cb4108f11394d7b7dbb270cae93aefe4e5511..8843939070d4155ef3457a90548cee1f
  
              PrimaryLevelData iworlddataserver = worlddata;
              boolean flag = worlddata.isDebugWorld();
-@@ -571,6 +567,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -570,6 +566,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  biomeProvider = gen.getDefaultBiomeProvider(worldInfo);
              }
  
diff --git a/patches/server/0608-Add-Unix-domain-socket-support.patch b/patches/server/0608-Add-Unix-domain-socket-support.patch
index e5c081c0e5..459999250c 100644
--- a/patches/server/0608-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0608-Add-Unix-domain-socket-support.patch
@@ -11,7 +11,7 @@ Tested-by: Mariell Hoversholm <proximyst@proximyst.com>
 Reviewed-by: Mariell Hoversholm <proximyst@proximyst.com>
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 75c0ea2a59963334555efa1af03693fdff0fac32..1fbe7a58707ddd40f80d71e3703ff3fefff672f4 100644
+index 60d5142f17c561fd7268999faaa084642abbb65c..e2c55689e881a14e457bc21ac42cf126f7af56f2 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -219,6 +219,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0614-Add-PlayerKickEvent-causes.patch b/patches/server/0614-Add-PlayerKickEvent-causes.patch
index 9d308fed42..5f28e53184 100644
--- a/patches/server/0614-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0614-Add-PlayerKickEvent-causes.patch
@@ -36,10 +36,10 @@ index b5f54ee82905e3e6ab5bfde35ab625f5feeb1393..c0a80824a0307ea673805015119cc834
  
          public boolean shouldDisconnect() {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8843939070d4155ef3457a90548cee1f19debb2f..e4cf95705ac73d7333628d2659caec444b750420 100644
+index 3054716dda1fcfe6c457d81dd89c82bf6acc64a3..64081583ee2a29b43d487b3730342dce7ac85e94 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2151,7 +2151,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2150,7 +2150,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  ServerPlayer entityplayer = (ServerPlayer) iterator.next();
  
                  if (!whitelist.isWhiteListed(entityplayer.getGameProfile()) && !this.getPlayerList().isOp(entityplayer.getGameProfile())) { // Paper - Fix kicking ops when whitelist is reloaded (MC-171420)
diff --git a/patches/server/0645-Fix-test-not-bootstrapping.patch b/patches/server/0645-Fix-test-not-bootstrapping.patch
deleted file mode 100644
index 6c582bf1e6..0000000000
--- a/patches/server/0645-Fix-test-not-bootstrapping.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mariell Hoversholm <proximyst@proximyst.com>
-Date: Mon, 2 Aug 2021 08:52:21 +0200
-Subject: [PATCH] Fix test not bootstrapping
-
-Signed-off-by: Mariell Hoversholm <proximyst@proximyst.com>
-
-diff --git a/src/test/java/org/bukkit/enchantments/EnchantmentTargetTest.java b/src/test/java/org/bukkit/enchantments/EnchantmentTargetTest.java
-index 439bf35c251ab5dc0d27923e62789a496618de82..5d3b8ba99d0fe966b7329540d61825aa266c7e64 100644
---- a/src/test/java/org/bukkit/enchantments/EnchantmentTargetTest.java
-+++ b/src/test/java/org/bukkit/enchantments/EnchantmentTargetTest.java
-@@ -5,10 +5,11 @@ import net.minecraft.world.item.Item;
- import net.minecraft.world.item.enchantment.EnchantmentCategory;
- import org.bukkit.Material;
- import org.bukkit.craftbukkit.util.CraftMagicNumbers;
-+import org.bukkit.support.AbstractTestingBase;
- import org.junit.Assert;
- import org.junit.Test;
- 
--public class EnchantmentTargetTest {
-+public class EnchantmentTargetTest extends AbstractTestingBase { // Paper
- 
-     @Test
-     public void test() {
diff --git a/patches/server/0646-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/server/0645-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/server/0646-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/server/0645-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/server/0647-Improve-boat-collision-performance.patch b/patches/server/0646-Improve-boat-collision-performance.patch
similarity index 97%
rename from patches/server/0647-Improve-boat-collision-performance.patch
rename to patches/server/0646-Improve-boat-collision-performance.patch
index b2dc68aa68..49ada3e1d4 100644
--- a/patches/server/0647-Improve-boat-collision-performance.patch
+++ b/patches/server/0646-Improve-boat-collision-performance.patch
@@ -54,7 +54,7 @@ index 15bc39170f06bd4ea5da770bd0fe3d8d08366c48..cef1fa35e3ec613cdea32785fa7848bd
                  }
              }
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
-index c7634407ccaf76513f19688c0f5e102bb2b5a997..35aeba4e8430e6419caa9db4a0b931a994228618 100644
+index a459a7889c7462b9c8e6474d987151f15720a98e..2c5658df753ebc08f8531d4bdf22ff8f6ca77e94 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/Boat.java
 @@ -709,8 +709,8 @@ public class Boat extends Entity implements VariantHolder<Boat.Type> {
diff --git a/patches/server/0648-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0647-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 100%
rename from patches/server/0648-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0647-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0649-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0648-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 95%
rename from patches/server/0649-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0648-Allow-skipping-writing-of-comments-to-server.propert.patch
index c456bcd235..9fba827e12 100644
--- a/patches/server/0649-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0648-Allow-skipping-writing-of-comments-to-server.propert.patch
@@ -8,7 +8,7 @@ Makes less git noise, as it won't update the date every single time
 Use -DPaper.skipServerPropertiesComments=true flag to disable writing it
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/Settings.java b/src/main/java/net/minecraft/server/dedicated/Settings.java
-index 9dde5b89e6de9d470b0c0b08e3aa6c471cd075fe..f6e423a76d4c9cf639f1d44af80d33cf3072f6b5 100644
+index ca23639f15107ccd43b874ae38fa37279b827a8f..faca42b2b5b20559f98c300b7011b67165391a0d 100644
 --- a/src/main/java/net/minecraft/server/dedicated/Settings.java
 +++ b/src/main/java/net/minecraft/server/dedicated/Settings.java
 @@ -29,6 +29,7 @@ public abstract class Settings<T extends Settings<T>> {
@@ -19,7 +19,7 @@ index 9dde5b89e6de9d470b0c0b08e3aa6c471cd075fe..f6e423a76d4c9cf639f1d44af80d33cf
      // CraftBukkit start
      private OptionSet options = null;
  
-@@ -118,7 +119,46 @@ public abstract class Settings<T extends Settings<T>> {
+@@ -123,7 +124,46 @@ public abstract class Settings<T extends Settings<T>> {
                  return;
              }
              // CraftBukkit end
diff --git a/patches/server/0650-Add-PlayerSetSpawnEvent.patch b/patches/server/0649-Add-PlayerSetSpawnEvent.patch
similarity index 100%
rename from patches/server/0650-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0649-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0651-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0650-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0651-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0650-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0652-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0651-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0652-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0651-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0653-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0652-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0653-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0652-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0654-Added-EntityDamageItemEvent.patch b/patches/server/0653-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0654-Added-EntityDamageItemEvent.patch
rename to patches/server/0653-Added-EntityDamageItemEvent.patch
diff --git a/patches/server/0655-Optimize-indirect-passenger-iteration.patch b/patches/server/0654-Optimize-indirect-passenger-iteration.patch
similarity index 100%
rename from patches/server/0655-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0654-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0656-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0655-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0656-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0655-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0657-Make-EntityUnleashEvent-cancellable.patch b/patches/server/0656-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/server/0657-Make-EntityUnleashEvent-cancellable.patch
rename to patches/server/0656-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/server/0658-Clear-bucket-NBT-after-dispense.patch b/patches/server/0657-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0658-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0657-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0659-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0658-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0659-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0658-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0660-Add-BlockBreakBlockEvent.patch b/patches/server/0659-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0660-Add-BlockBreakBlockEvent.patch
rename to patches/server/0659-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0661-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/server/0660-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/server/0661-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/server/0660-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/server/0662-More-CommandBlock-API.patch b/patches/server/0661-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0662-More-CommandBlock-API.patch
rename to patches/server/0661-More-CommandBlock-API.patch
diff --git a/patches/server/0663-Add-missing-team-sidebar-display-slots.patch b/patches/server/0662-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0663-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0662-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0664-Add-back-EntityPortalExitEvent.patch b/patches/server/0663-Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/0664-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0663-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0665-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0664-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 100%
rename from patches/server/0665-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0664-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0666-Get-entity-default-attributes.patch b/patches/server/0665-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/server/0666-Get-entity-default-attributes.patch
rename to patches/server/0665-Get-entity-default-attributes.patch
diff --git a/patches/server/0667-Left-handed-API.patch b/patches/server/0666-Left-handed-API.patch
similarity index 100%
rename from patches/server/0667-Left-handed-API.patch
rename to patches/server/0666-Left-handed-API.patch
diff --git a/patches/server/0668-Add-more-advancement-API.patch b/patches/server/0667-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0668-Add-more-advancement-API.patch
rename to patches/server/0667-Add-more-advancement-API.patch
diff --git a/patches/server/0669-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0668-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0669-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0668-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0670-Add-critical-damage-API.patch b/patches/server/0669-Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/0670-Add-critical-damage-API.patch
rename to patches/server/0669-Add-critical-damage-API.patch
diff --git a/patches/server/0671-Fix-issues-with-mob-conversion.patch b/patches/server/0670-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0671-Fix-issues-with-mob-conversion.patch
rename to patches/server/0670-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0672-Add-isCollidable-methods-to-various-places.patch b/patches/server/0671-Add-isCollidable-methods-to-various-places.patch
similarity index 100%
rename from patches/server/0672-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0671-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/server/0673-Goat-ram-API.patch b/patches/server/0672-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0673-Goat-ram-API.patch
rename to patches/server/0672-Goat-ram-API.patch
diff --git a/patches/server/0674-Add-API-for-resetting-a-single-score.patch b/patches/server/0673-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0674-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0673-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0675-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0674-Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/server/0675-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0674-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0676-Vanilla-command-permission-fixes.patch b/patches/server/0675-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0676-Vanilla-command-permission-fixes.patch
rename to patches/server/0675-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0677-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0676-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 100%
rename from patches/server/0677-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0676-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0678-Fix-GameProfileCache-concurrency.patch b/patches/server/0677-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0678-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0677-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0679-Improve-and-expand-AsyncCatcher.patch b/patches/server/0678-Improve-and-expand-AsyncCatcher.patch
similarity index 100%
rename from patches/server/0679-Improve-and-expand-AsyncCatcher.patch
rename to patches/server/0678-Improve-and-expand-AsyncCatcher.patch
diff --git a/patches/server/0680-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0679-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 99%
rename from patches/server/0680-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0679-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 4e8ee012ce..e285c1f3b6 100644
--- a/patches/server/0680-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0679-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -257,7 +257,7 @@ index 0000000000000000000000000000000000000000..d3b39d88a72ca25057fd8574d32f28db
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index a3461824fd2162d509facf6f64c5008e3f0fd42b..d4f99f4592a86e2d8344bc2c44711fef1543acdf 100644
+index e57bb23ec14263b7c9dd721fefbe912963b863d0..7bfc95b2a4fd94bcb0347fd7aff9fe0e9b54daf1 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -192,6 +192,16 @@ public final class NaturalSpawner {
diff --git a/patches/server/0681-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0680-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0681-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0680-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0682-Allow-controlled-flushing-for-network-manager.patch b/patches/server/0681-Allow-controlled-flushing-for-network-manager.patch
similarity index 100%
rename from patches/server/0682-Allow-controlled-flushing-for-network-manager.patch
rename to patches/server/0681-Allow-controlled-flushing-for-network-manager.patch
diff --git a/patches/server/0683-Optimise-general-POI-access.patch b/patches/server/0682-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/0683-Optimise-general-POI-access.patch
rename to patches/server/0682-Optimise-general-POI-access.patch
diff --git a/patches/server/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/server/0683-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
similarity index 100%
rename from patches/server/0684-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
rename to patches/server/0683-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch
diff --git a/patches/server/0685-Optimise-chunk-tick-iteration.patch b/patches/server/0684-Optimise-chunk-tick-iteration.patch
similarity index 100%
rename from patches/server/0685-Optimise-chunk-tick-iteration.patch
rename to patches/server/0684-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/0686-Execute-chunk-tasks-mid-tick.patch b/patches/server/0685-Execute-chunk-tasks-mid-tick.patch
similarity index 97%
rename from patches/server/0686-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/0685-Execute-chunk-tasks-mid-tick.patch
index e5510c741d..8b715e849a 100644
--- a/patches/server/0686-Execute-chunk-tasks-mid-tick.patch
+++ b/patches/server/0685-Execute-chunk-tasks-mid-tick.patch
@@ -19,10 +19,10 @@ index 4d861f9a58f8ea238471af22f387854d855b1801..efbf77024d235d8af9f7efc938c17afd
  
      private MinecraftTimings() {}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e4cf95705ac73d7333628d2659caec444b750420..32fda33ff9684e08da6e7bee2eb0dc26ed701950 100644
+index 64081583ee2a29b43d487b3730342dce7ac85e94..b54a3dcbd94582158a7119b92b02be5a4e32877c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1303,6 +1303,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1302,6 +1302,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      private boolean pollTaskInternal() {
          if (super.pollTask()) {
@@ -30,7 +30,7 @@ index e4cf95705ac73d7333628d2659caec444b750420..32fda33ff9684e08da6e7bee2eb0dc26
              return true;
          } else {
              if (this.haveTime()) {
-@@ -2706,4 +2707,74 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2705,4 +2706,74 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
      }
      // Paper end
diff --git a/patches/server/0687-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/0686-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/0687-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/0686-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/0688-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/0687-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/0688-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/0687-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/0689-Detail-more-information-in-watchdog-dumps.patch b/patches/server/0688-Detail-more-information-in-watchdog-dumps.patch
similarity index 100%
rename from patches/server/0689-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/0688-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/0690-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0689-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0690-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0689-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0691-Distance-manager-tick-timings.patch b/patches/server/0690-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/0691-Distance-manager-tick-timings.patch
rename to patches/server/0690-Distance-manager-tick-timings.patch
diff --git a/patches/server/0692-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0691-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0692-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0691-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0693-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0692-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 100%
rename from patches/server/0693-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0692-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0694-Add-packet-limiter-config.patch b/patches/server/0693-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0694-Add-packet-limiter-config.patch
rename to patches/server/0693-Add-packet-limiter-config.patch
diff --git a/patches/server/0695-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0694-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0695-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0694-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0696-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/server/0695-Consolidate-flush-calls-for-entity-tracker-packets.patch
similarity index 100%
rename from patches/server/0696-Consolidate-flush-calls-for-entity-tracker-packets.patch
rename to patches/server/0695-Consolidate-flush-calls-for-entity-tracker-packets.patch
diff --git a/patches/server/0697-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/server/0696-Don-t-lookup-fluid-state-when-raytracing.patch
similarity index 100%
rename from patches/server/0697-Don-t-lookup-fluid-state-when-raytracing.patch
rename to patches/server/0696-Don-t-lookup-fluid-state-when-raytracing.patch
diff --git a/patches/server/0698-Time-scoreboard-search.patch b/patches/server/0697-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0698-Time-scoreboard-search.patch
rename to patches/server/0697-Time-scoreboard-search.patch
diff --git a/patches/server/0699-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/0698-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/0699-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/0698-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/0700-Do-not-run-raytrace-logic-for-AIR.patch b/patches/server/0699-Do-not-run-raytrace-logic-for-AIR.patch
similarity index 100%
rename from patches/server/0700-Do-not-run-raytrace-logic-for-AIR.patch
rename to patches/server/0699-Do-not-run-raytrace-logic-for-AIR.patch
diff --git a/patches/server/0701-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0700-Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/0701-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0700-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0702-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0701-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0702-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0701-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0703-Optimise-random-block-ticking.patch b/patches/server/0702-Optimise-random-block-ticking.patch
similarity index 100%
rename from patches/server/0703-Optimise-random-block-ticking.patch
rename to patches/server/0702-Optimise-random-block-ticking.patch
diff --git a/patches/server/0704-Optimise-non-flush-packet-sending.patch b/patches/server/0703-Optimise-non-flush-packet-sending.patch
similarity index 100%
rename from patches/server/0704-Optimise-non-flush-packet-sending.patch
rename to patches/server/0703-Optimise-non-flush-packet-sending.patch
diff --git a/patches/server/0705-Optimise-nearby-player-lookups.patch b/patches/server/0704-Optimise-nearby-player-lookups.patch
similarity index 99%
rename from patches/server/0705-Optimise-nearby-player-lookups.patch
rename to patches/server/0704-Optimise-nearby-player-lookups.patch
index 2e5e702005..cb025f38bc 100644
--- a/patches/server/0705-Optimise-nearby-player-lookups.patch
+++ b/patches/server/0704-Optimise-nearby-player-lookups.patch
@@ -300,7 +300,7 @@ index 69886eb8bf9769aa8f2942ad68aeadbb4e86c223..5778dd4bdcf116d7932cebcd261c5f62
      public abstract ResourceKey<LevelStem> getTypeKey();
  
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index f8ad4601139711ac0491505eee32d4f98b6ceb30..7ee4ae3a31b1aa02140f1075a35ed1cc8d87fe96 100644
+index 7bfc95b2a4fd94bcb0347fd7aff9fe0e9b54daf1..9ae2bd64514a83dbd8c22cc35a9ca4c39add5142 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -260,7 +260,7 @@ public final class NaturalSpawner {
diff --git a/patches/server/0706-Remove-streams-for-villager-AI.patch b/patches/server/0705-Remove-streams-for-villager-AI.patch
similarity index 100%
rename from patches/server/0706-Remove-streams-for-villager-AI.patch
rename to patches/server/0705-Remove-streams-for-villager-AI.patch
diff --git a/patches/server/0707-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0706-Use-Velocity-compression-and-cipher-natives.patch
similarity index 100%
rename from patches/server/0707-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/0706-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0708-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/server/0707-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
similarity index 100%
rename from patches/server/0708-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
rename to patches/server/0707-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch
diff --git a/patches/server/0709-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/server/0708-Fix-Bukkit-NamespacedKey-shenanigans.patch
similarity index 100%
rename from patches/server/0709-Fix-Bukkit-NamespacedKey-shenanigans.patch
rename to patches/server/0708-Fix-Bukkit-NamespacedKey-shenanigans.patch
diff --git a/patches/server/0710-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0709-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 100%
rename from patches/server/0710-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0709-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0711-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0710-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0711-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0710-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0712-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0711-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 100%
rename from patches/server/0712-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0711-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0713-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0712-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0713-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0712-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0714-Ensure-valid-vehicle-status.patch b/patches/server/0713-Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/0714-Ensure-valid-vehicle-status.patch
rename to patches/server/0713-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0715-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0714-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 91%
rename from patches/server/0715-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0714-Prevent-softlocked-end-exit-portal-generation.patch
index 9cbe871fbc..151284d784 100644
--- a/patches/server/0715-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0714-Prevent-softlocked-end-exit-portal-generation.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent softlocked end exit portal generation
 
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index b5d69bde512f832374acd5e6b94268ea327b01b2..f67fcaff1994e5eb1195d1ec6d5a27d01c12d7a7 100644
+index 5c0767a0bc37b5f0aa3f8892826e58f93f11cf97..294f384326c01d28c28908a56905b925b1b3bd76 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -466,6 +466,11 @@ public class EndDragonFight {
diff --git a/patches/server/0716-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0715-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0716-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0715-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0717-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0716-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0717-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0716-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0718-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0717-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0718-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0717-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0719-Preserve-overstacked-loot.patch b/patches/server/0718-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0719-Preserve-overstacked-loot.patch
rename to patches/server/0718-Preserve-overstacked-loot.patch
diff --git a/patches/server/0720-Update-head-rotation-in-missing-places.patch b/patches/server/0719-Update-head-rotation-in-missing-places.patch
similarity index 100%
rename from patches/server/0720-Update-head-rotation-in-missing-places.patch
rename to patches/server/0719-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0721-prevent-unintended-light-block-manipulation.patch b/patches/server/0720-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0721-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0720-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0722-Fix-CraftCriteria-defaults-map.patch b/patches/server/0721-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0722-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0721-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0723-Fix-upstreams-block-state-factories.patch b/patches/server/0722-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0723-Fix-upstreams-block-state-factories.patch
rename to patches/server/0722-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0724-Add-config-option-for-logging-player-ip-addresses.patch b/patches/server/0723-Add-config-option-for-logging-player-ip-addresses.patch
similarity index 100%
rename from patches/server/0724-Add-config-option-for-logging-player-ip-addresses.patch
rename to patches/server/0723-Add-config-option-for-logging-player-ip-addresses.patch
diff --git a/patches/server/0725-Configurable-feature-seeds.patch b/patches/server/0724-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0725-Configurable-feature-seeds.patch
rename to patches/server/0724-Configurable-feature-seeds.patch
diff --git a/patches/server/0726-Add-root-admin-user-detection.patch b/patches/server/0725-Add-root-admin-user-detection.patch
similarity index 97%
rename from patches/server/0726-Add-root-admin-user-detection.patch
rename to patches/server/0725-Add-root-admin-user-detection.patch
index bc171867c0..c8662384a1 100644
--- a/patches/server/0726-Add-root-admin-user-detection.patch
+++ b/patches/server/0725-Add-root-admin-user-detection.patch
@@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..6bd0afddbcc461149dfe9a5c7a86fff6
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 1fbe7a58707ddd40f80d71e3703ff3fefff672f4..9a45921cbb1e7a39e6ef46cc93c14766ee8229ad 100644
+index e2c55689e881a14e457bc21ac42cf126f7af56f2..ad3b5a3b1f63b151d9215584152435cd56e6b622 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -179,6 +179,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0727-Always-allow-item-changing-in-Fireball.patch b/patches/server/0726-Always-allow-item-changing-in-Fireball.patch
similarity index 100%
rename from patches/server/0727-Always-allow-item-changing-in-Fireball.patch
rename to patches/server/0726-Always-allow-item-changing-in-Fireball.patch
diff --git a/patches/server/0728-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0727-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0728-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0727-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0729-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0728-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0729-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0728-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0730-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0729-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0730-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0729-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0731-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0730-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0731-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0730-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0732-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0731-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0732-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0731-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0733-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0732-Hide-unnecessary-itemmeta-from-clients.patch
similarity index 100%
rename from patches/server/0733-Hide-unnecessary-itemmeta-from-clients.patch
rename to patches/server/0732-Hide-unnecessary-itemmeta-from-clients.patch
diff --git a/patches/server/0734-Fix-Spigot-growth-modifiers.patch b/patches/server/0733-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0734-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0733-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0735-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0734-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0735-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0734-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0736-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0735-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0736-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0735-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0737-Optimize-HashMapPalette.patch b/patches/server/0736-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0737-Optimize-HashMapPalette.patch
rename to patches/server/0736-Optimize-HashMapPalette.patch
diff --git a/patches/server/0738-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0737-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0738-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0737-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0739-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/server/0738-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
similarity index 100%
rename from patches/server/0739-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
rename to patches/server/0738-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch
diff --git a/patches/server/0740-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/0739-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from patches/server/0740-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/0739-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/0741-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0740-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0741-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0740-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0742-Add-more-Campfire-API.patch b/patches/server/0741-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0742-Add-more-Campfire-API.patch
rename to patches/server/0741-Add-more-Campfire-API.patch
diff --git a/patches/server/0743-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0742-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0743-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0742-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0744-Fix-tripwire-state-inconsistency.patch b/patches/server/0743-Fix-tripwire-state-inconsistency.patch
similarity index 100%
rename from patches/server/0744-Fix-tripwire-state-inconsistency.patch
rename to patches/server/0743-Fix-tripwire-state-inconsistency.patch
diff --git a/patches/server/0745-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0744-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0745-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0744-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0746-Improve-scoreboard-entries.patch b/patches/server/0745-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0746-Improve-scoreboard-entries.patch
rename to patches/server/0745-Improve-scoreboard-entries.patch
diff --git a/patches/server/0747-Entity-powdered-snow-API.patch b/patches/server/0746-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0747-Entity-powdered-snow-API.patch
rename to patches/server/0746-Entity-powdered-snow-API.patch
diff --git a/patches/server/0748-Add-API-for-item-entity-health.patch b/patches/server/0747-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0748-Add-API-for-item-entity-health.patch
rename to patches/server/0747-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0749-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/0748-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/0749-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/0748-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/0750-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0749-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0750-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0749-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0751-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0750-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0751-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0750-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0752-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/server/0751-Load-effect-amplifiers-greater-than-127-correctly.patch
similarity index 100%
rename from patches/server/0752-Load-effect-amplifiers-greater-than-127-correctly.patch
rename to patches/server/0751-Load-effect-amplifiers-greater-than-127-correctly.patch
diff --git a/patches/server/0753-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0752-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0753-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0752-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0754-Fix-bees-aging-inside-hives.patch b/patches/server/0753-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0754-Fix-bees-aging-inside-hives.patch
rename to patches/server/0753-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0755-Bucketable-API.patch b/patches/server/0754-Bucketable-API.patch
similarity index 100%
rename from patches/server/0755-Bucketable-API.patch
rename to patches/server/0754-Bucketable-API.patch
diff --git a/patches/server/0756-Validate-usernames.patch b/patches/server/0755-Validate-usernames.patch
similarity index 100%
rename from patches/server/0756-Validate-usernames.patch
rename to patches/server/0755-Validate-usernames.patch
diff --git a/patches/server/0757-Make-water-animal-spawn-height-configurable.patch b/patches/server/0756-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0757-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0756-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0758-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0757-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 98%
rename from patches/server/0758-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0757-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 2d98966947..fb05c9468b 100644
--- a/patches/server/0758-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0757-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose vanilla BiomeProvider from WorldInfo
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 32fda33ff9684e08da6e7bee2eb0dc26ed701950..5dd0602cab15e7f063f9ef182bb179356e50012b 100644
+index b54a3dcbd94582158a7119b92b02be5a4e32877c..18269a33f6eb3623fbfa6dd551426515404e8c95 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -562,7 +562,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -561,7 +561,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              List<CustomSpawner> list = ImmutableList.of(new PhantomSpawner(), new PatrolSpawner(), new CatSpawner(), new VillageSiege(), new WanderingTraderSpawner(iworlddataserver));
              LevelStem worlddimension = (LevelStem) dimensions.get(dimensionKey);
  
diff --git a/patches/server/0759-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0758-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0759-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0758-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0760-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/server/0759-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/server/0760-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/server/0759-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/server/0761-Multiple-Entries-with-Scoreboards.patch b/patches/server/0760-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0761-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0760-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0762-Reset-placed-block-on-exception.patch b/patches/server/0761-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0762-Reset-placed-block-on-exception.patch
rename to patches/server/0761-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0763-Add-configurable-height-for-slime-spawn.patch b/patches/server/0762-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0763-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0762-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0764-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/server/0763-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/server/0764-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/server/0763-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/server/0765-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0764-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0765-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0764-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0766-Kick-on-main-for-illegal-chat.patch b/patches/server/0765-Kick-on-main-for-illegal-chat.patch
similarity index 100%
rename from patches/server/0766-Kick-on-main-for-illegal-chat.patch
rename to patches/server/0765-Kick-on-main-for-illegal-chat.patch
diff --git a/patches/server/0767-Multi-Block-Change-API-Implementation.patch b/patches/server/0766-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0767-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0766-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0768-Fix-NotePlayEvent.patch b/patches/server/0767-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0768-Fix-NotePlayEvent.patch
rename to patches/server/0767-Fix-NotePlayEvent.patch
diff --git a/patches/server/0769-Freeze-Tick-Lock-API.patch b/patches/server/0768-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0769-Freeze-Tick-Lock-API.patch
rename to patches/server/0768-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0770-Dolphin-API.patch b/patches/server/0769-Dolphin-API.patch
similarity index 100%
rename from patches/server/0770-Dolphin-API.patch
rename to patches/server/0769-Dolphin-API.patch
diff --git a/patches/server/0771-More-PotionEffectType-API.patch b/patches/server/0770-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0771-More-PotionEffectType-API.patch
rename to patches/server/0770-More-PotionEffectType-API.patch
diff --git a/patches/server/0772-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0771-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0772-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0771-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0773-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0772-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0773-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0772-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0774-Add-missing-structure-set-seed-configs.patch b/patches/server/0773-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0774-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0773-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0775-Implement-regenerateChunk.patch b/patches/server/0774-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0775-Implement-regenerateChunk.patch
rename to patches/server/0774-Implement-regenerateChunk.patch
diff --git a/patches/server/0776-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0775-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0776-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0775-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0777-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0776-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0777-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0776-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0778-Add-GameEvent-tags.patch b/patches/server/0777-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0778-Add-GameEvent-tags.patch
rename to patches/server/0777-Add-GameEvent-tags.patch
diff --git a/patches/server/0779-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0778-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 87%
rename from patches/server/0779-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0778-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index 5d99b78f06..0e3f262db5 100644
--- a/patches/server/0779-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0778-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
@@ -9,10 +9,10 @@ This might result in chunks loading far slower in the nether,
 for example.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5dd0602cab15e7f063f9ef182bb179356e50012b..e9210402d0dfb7c15d44ba868fdf47ca98875ab4 100644
+index 18269a33f6eb3623fbfa6dd551426515404e8c95..42a3b0b7eee3b8eb7e833335dfdba76d185ad141 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1306,6 +1306,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1305,6 +1305,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.executeMidTickTasks(); // Paper - execute chunk tasks mid tick
              return true;
          } else {
@@ -20,7 +20,7 @@ index 5dd0602cab15e7f063f9ef182bb179356e50012b..e9210402d0dfb7c15d44ba868fdf47ca
              if (this.haveTime()) {
                  Iterator iterator = this.getAllLevels().iterator();
  
-@@ -1313,12 +1314,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1312,12 +1313,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      ServerLevel worldserver = (ServerLevel) iterator.next();
  
                      if (worldserver.getChunkSource().pollTask()) {
diff --git a/patches/server/0780-Furnace-RecipesUsed-API.patch b/patches/server/0779-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0780-Furnace-RecipesUsed-API.patch
rename to patches/server/0779-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0781-Configurable-sculk-sensor-listener-range.patch b/patches/server/0780-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0781-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0780-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0782-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0781-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0782-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0781-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0783-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0782-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 93%
rename from patches/server/0783-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0782-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 63745d522f..08793cfb36 100644
--- a/patches/server/0783-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0782-Option-to-have-default-CustomSpawners-in-custom-worl.patch
@@ -10,10 +10,10 @@ just looking at the LevelStem key, look at the DimensionType key which
 is one level below that. Defaults to off to keep vanilla behavior.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e9210402d0dfb7c15d44ba868fdf47ca98875ab4..1c401b5ee78a52e16e469be77abfa830152cb5f5 100644
+index 42a3b0b7eee3b8eb7e833335dfdba76d185ad141..5b64fe9f8c6d6fecad67a395a38fe6d7c91c5954 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -589,7 +589,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -588,7 +588,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  this.commandStorage = new CommandStorage(worldpersistentdata);
              } else {
                  ChunkProgressListener worldloadlistener = this.progressListenerFactory.create(11);
diff --git a/patches/server/0784-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0783-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 92%
rename from patches/server/0784-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0783-Put-world-into-worldlist-before-initing-the-world.patch
index 48bbd69c7b..7695344878 100644
--- a/patches/server/0784-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0783-Put-world-into-worldlist-before-initing-the-world.patch
@@ -7,10 +7,10 @@ Some parts of legacy conversion will need the overworld
 to get the legacy structure data storage
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1c401b5ee78a52e16e469be77abfa830152cb5f5..e2eaa10a5d3cc3aa703f0d1406b5065327130861 100644
+index 5b64fe9f8c6d6fecad67a395a38fe6d7c91c5954..980b8055b971376e5999d81accf4db3b54cf584e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -601,9 +601,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -600,9 +600,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              }
  
              worlddata.setModdedInfo(this.getServerModName(), this.getModdedStatus().shouldReportAsModified());
diff --git a/patches/server/0785-Fix-Entity-Position-Desync.patch b/patches/server/0784-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0785-Fix-Entity-Position-Desync.patch
rename to patches/server/0784-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0786-Custom-Potion-Mixes.patch b/patches/server/0785-Custom-Potion-Mixes.patch
similarity index 98%
rename from patches/server/0786-Custom-Potion-Mixes.patch
rename to patches/server/0785-Custom-Potion-Mixes.patch
index 5eba0abefd..0f8702a668 100644
--- a/patches/server/0786-Custom-Potion-Mixes.patch
+++ b/patches/server/0785-Custom-Potion-Mixes.patch
@@ -24,10 +24,10 @@ index 0000000000000000000000000000000000000000..6b0bed550763f34e18c9e92f9a47ec0c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e2eaa10a5d3cc3aa703f0d1406b5065327130861..e52936ce703b9c95f85a41b90fb3cb3df8a04fce 100644
+index 980b8055b971376e5999d81accf4db3b54cf584e..d8747518678596586dccb636d8e9b805260e75a7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2058,6 +2058,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2057,6 +2057,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
              this.worldData.setDataConfiguration(worlddataconfiguration);
              this.resources.managers.updateRegistryTags(this.registryAccess());
diff --git a/patches/server/0787-Force-close-world-loading-screen.patch b/patches/server/0786-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0787-Force-close-world-loading-screen.patch
rename to patches/server/0786-Force-close-world-loading-screen.patch
diff --git a/patches/server/0788-Fix-falling-block-spawn-methods.patch b/patches/server/0787-Fix-falling-block-spawn-methods.patch
similarity index 100%
rename from patches/server/0788-Fix-falling-block-spawn-methods.patch
rename to patches/server/0787-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0789-Expose-furnace-minecart-push-values.patch b/patches/server/0788-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0789-Expose-furnace-minecart-push-values.patch
rename to patches/server/0788-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0790-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0789-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0790-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0789-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0791-More-Projectile-API.patch b/patches/server/0790-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0791-More-Projectile-API.patch
rename to patches/server/0790-More-Projectile-API.patch
diff --git a/patches/server/0792-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0791-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0792-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0791-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0793-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0792-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0793-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0792-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0794-Implement-getComputedBiome-API.patch b/patches/server/0793-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0794-Implement-getComputedBiome-API.patch
rename to patches/server/0793-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0795-Make-some-itemstacks-nonnull.patch b/patches/server/0794-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0795-Make-some-itemstacks-nonnull.patch
rename to patches/server/0794-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0796-Implement-enchantWithLevels-API.patch b/patches/server/0795-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0796-Implement-enchantWithLevels-API.patch
rename to patches/server/0795-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0797-Fix-saving-in-unloadWorld.patch b/patches/server/0796-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0797-Fix-saving-in-unloadWorld.patch
rename to patches/server/0796-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0798-Buffer-OOB-setBlock-calls.patch b/patches/server/0797-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0798-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0797-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0799-Add-TameableDeathMessageEvent.patch b/patches/server/0798-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0799-Add-TameableDeathMessageEvent.patch
rename to patches/server/0798-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0800-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0799-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0800-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0799-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0801-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0800-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0801-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0800-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0802-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0801-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0802-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0801-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0803-Guard-against-invalid-entity-positions.patch b/patches/server/0802-Guard-against-invalid-entity-positions.patch
similarity index 100%
rename from patches/server/0803-Guard-against-invalid-entity-positions.patch
rename to patches/server/0802-Guard-against-invalid-entity-positions.patch
diff --git a/patches/server/0804-cache-resource-keys.patch b/patches/server/0803-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0804-cache-resource-keys.patch
rename to patches/server/0803-cache-resource-keys.patch
diff --git a/patches/server/0805-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0804-Allow-to-change-the-podium-for-the-EnderDragon.patch
similarity index 100%
rename from patches/server/0805-Allow-to-change-the-podium-for-the-EnderDragon.patch
rename to patches/server/0804-Allow-to-change-the-podium-for-the-EnderDragon.patch
diff --git a/patches/server/0806-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0805-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0806-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0805-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0807-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/server/0806-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
similarity index 100%
rename from patches/server/0807-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
rename to patches/server/0806-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch
diff --git a/patches/server/0808-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0807-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0808-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0807-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0809-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0808-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0809-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0808-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0810-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/server/0809-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
similarity index 100%
rename from patches/server/0810-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
rename to patches/server/0809-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch
diff --git a/patches/server/0811-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/server/0810-Pass-ServerLevel-for-gamerule-callbacks.patch
similarity index 99%
rename from patches/server/0811-Pass-ServerLevel-for-gamerule-callbacks.patch
rename to patches/server/0810-Pass-ServerLevel-for-gamerule-callbacks.patch
index 4c1f68c775..20b190da6f 100644
--- a/patches/server/0811-Pass-ServerLevel-for-gamerule-callbacks.patch
+++ b/patches/server/0810-Pass-ServerLevel-for-gamerule-callbacks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Pass ServerLevel for gamerule callbacks
 
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 9a45921cbb1e7a39e6ef46cc93c14766ee8229ad..8115cf64a30b6438721769df6045e1b77acf88ce 100644
+index ad3b5a3b1f63b151d9215584152435cd56e6b622..a0d50b475b21cdcea4ace553a3980411476469f7 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -304,7 +304,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0812-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/server/0811-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0812-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/server/0811-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/server/0813-WorldCreator-keepSpawnLoaded.patch b/patches/server/0812-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0813-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0812-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0814-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0813-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
similarity index 100%
rename from patches/server/0814-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
rename to patches/server/0813-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0815-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0814-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0815-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0814-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0816-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0815-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0816-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0815-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0817-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0816-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0817-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0816-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0818-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0817-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0818-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0817-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0819-Add-PlayerStopUsingItemEvent.patch b/patches/server/0818-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0819-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0818-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0820-FallingBlock-auto-expire-setting.patch b/patches/server/0819-FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/server/0820-FallingBlock-auto-expire-setting.patch
rename to patches/server/0819-FallingBlock-auto-expire-setting.patch
diff --git a/patches/server/0821-Don-t-tick-markers.patch b/patches/server/0820-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0821-Don-t-tick-markers.patch
rename to patches/server/0820-Don-t-tick-markers.patch
diff --git a/patches/server/0822-Do-not-accept-invalid-client-settings.patch b/patches/server/0821-Do-not-accept-invalid-client-settings.patch
similarity index 100%
rename from patches/server/0822-Do-not-accept-invalid-client-settings.patch
rename to patches/server/0821-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0823-Add-support-for-Proxy-Protocol.patch b/patches/server/0822-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0823-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0822-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0824-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0823-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0824-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0823-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0825-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0824-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0825-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0824-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0826-Sanitize-Sent-BlockEntity-NBT.patch b/patches/server/0825-Sanitize-Sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0826-Sanitize-Sent-BlockEntity-NBT.patch
rename to patches/server/0825-Sanitize-Sent-BlockEntity-NBT.patch
diff --git a/patches/server/0827-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0826-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0827-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0826-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0828-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0827-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0828-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0827-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0829-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0828-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 91%
rename from patches/server/0829-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0828-Throw-exception-on-world-create-while-being-ticked.patch
index 2bc0648f52..59b2d3cfaf 100644
--- a/patches/server/0829-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0828-Throw-exception-on-world-create-while-being-ticked.patch
@@ -7,10 +7,10 @@ There are no plans to support creating worlds while worlds are
 being ticked themselvess.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e52936ce703b9c95f85a41b90fb3cb3df8a04fce..dbeede822e4534b487d30772280eaac1d5c966f9 100644
+index d8747518678596586dccb636d8e9b805260e75a7..42f566c9155b70e04d457eb05934d678a92fcdb1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -310,6 +310,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -309,6 +309,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      public volatile Thread shutdownThread; // Paper
      public volatile boolean abnormalExit = false; // Paper
@@ -18,7 +18,7 @@ index e52936ce703b9c95f85a41b90fb3cb3df8a04fce..dbeede822e4534b487d30772280eaac1
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
-@@ -1483,7 +1484,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1482,7 +1483,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.getFunctions().tick();
          MinecraftTimings.commandFunctionsTimer.stopTiming(); // Spigot // Paper
          this.profiler.popPush("levels");
@@ -27,7 +27,7 @@ index e52936ce703b9c95f85a41b90fb3cb3df8a04fce..dbeede822e4534b487d30772280eaac1
  
          // CraftBukkit start
          // Run tasks that are waiting on processing
-@@ -1515,6 +1516,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1514,6 +1515,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Paper end
          MinecraftTimings.timeUpdateTimer.stopTiming(); // Spigot // Paper
  
@@ -36,7 +36,7 @@ index e52936ce703b9c95f85a41b90fb3cb3df8a04fce..dbeede822e4534b487d30772280eaac1
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
              worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
-@@ -1561,6 +1564,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1560,6 +1563,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.profiler.pop();
              worldserver.explosionDensityCache.clear(); // Paper - Optimize explosions
          }
diff --git a/patches/server/0830-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0829-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/0830-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0829-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0831-Dont-resent-entity-on-art-update.patch b/patches/server/0830-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0831-Dont-resent-entity-on-art-update.patch
rename to patches/server/0830-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0832-Add-WardenAngerChangeEvent.patch b/patches/server/0831-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0832-Add-WardenAngerChangeEvent.patch
rename to patches/server/0831-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0833-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0832-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 100%
rename from patches/server/0833-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0832-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0834-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0833-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0834-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0833-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0835-Nameable-Banner-API.patch b/patches/server/0834-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0835-Nameable-Banner-API.patch
rename to patches/server/0834-Nameable-Banner-API.patch
diff --git a/patches/server/0836-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0835-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 100%
rename from patches/server/0836-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0835-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0837-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0836-Prevent-empty-items-from-being-added-to-world.patch
similarity index 100%
rename from patches/server/0837-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0836-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0838-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0837-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0838-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0837-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0839-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/server/0838-Don-t-print-component-in-resource-pack-rejection-mes.patch
similarity index 100%
rename from patches/server/0839-Don-t-print-component-in-resource-pack-rejection-mes.patch
rename to patches/server/0838-Don-t-print-component-in-resource-pack-rejection-mes.patch
diff --git a/patches/server/0840-Add-Player-getFishHook.patch b/patches/server/0839-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0840-Add-Player-getFishHook.patch
rename to patches/server/0839-Add-Player-getFishHook.patch
diff --git a/patches/server/0841-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0840-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0841-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0840-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0842-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0841-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 100%
rename from patches/server/0842-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0841-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0843-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/server/0842-Add-some-minimal-debug-information-to-chat-packet-er.patch
similarity index 100%
rename from patches/server/0843-Add-some-minimal-debug-information-to-chat-packet-er.patch
rename to patches/server/0842-Add-some-minimal-debug-information-to-chat-packet-er.patch
diff --git a/patches/server/0844-Fix-Bee-flower-NPE.patch b/patches/server/0843-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0844-Fix-Bee-flower-NPE.patch
rename to patches/server/0843-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0845-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0844-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 100%
rename from patches/server/0845-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0844-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0846-More-Teleport-API.patch b/patches/server/0845-More-Teleport-API.patch
similarity index 100%
rename from patches/server/0846-More-Teleport-API.patch
rename to patches/server/0845-More-Teleport-API.patch
diff --git a/patches/server/0847-Add-EntityPortalReadyEvent.patch b/patches/server/0846-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/server/0847-Add-EntityPortalReadyEvent.patch
rename to patches/server/0846-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0848-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0847-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0848-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0847-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0849-Send-block-entities-after-destroy-prediction.patch b/patches/server/0848-Send-block-entities-after-destroy-prediction.patch
similarity index 100%
rename from patches/server/0849-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0848-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0850-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0849-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 100%
rename from patches/server/0850-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0849-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0851-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0850-Custom-Chat-Completion-Suggestions-API.patch
similarity index 100%
rename from patches/server/0851-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0850-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0852-Add-missing-BlockFadeEvents.patch b/patches/server/0851-Add-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0852-Add-missing-BlockFadeEvents.patch
rename to patches/server/0851-Add-missing-BlockFadeEvents.patch
diff --git a/patches/server/0853-Collision-API.patch b/patches/server/0852-Collision-API.patch
similarity index 100%
rename from patches/server/0853-Collision-API.patch
rename to patches/server/0852-Collision-API.patch
diff --git a/patches/server/0854-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0853-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0854-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0853-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0855-Block-Ticking-API.patch b/patches/server/0854-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0855-Block-Ticking-API.patch
rename to patches/server/0854-Block-Ticking-API.patch
diff --git a/patches/server/0856-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0855-Add-Velocity-IP-Forwarding-Support.patch
similarity index 99%
rename from patches/server/0856-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0855-Add-Velocity-IP-Forwarding-Support.patch
index 6ec422b4fb..d0399eb7fd 100644
--- a/patches/server/0856-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0855-Add-Velocity-IP-Forwarding-Support.patch
@@ -95,7 +95,7 @@ index 0000000000000000000000000000000000000000..c4934979b1ed85bfc4f8d9e6f8848b2b
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 8115cf64a30b6438721769df6045e1b77acf88ce..9f422cbeaa52b3e6a0a27af4f8ad4ddb7808483f 100644
+index a0d50b475b21cdcea4ace553a3980411476469f7..584d2e3fe54917542815194d2f06e7c054ddc559 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -274,13 +274,20 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
diff --git a/patches/server/0857-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/server/0856-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
similarity index 100%
rename from patches/server/0857-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
rename to patches/server/0856-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch
diff --git a/patches/server/0858-Add-NamespacedKey-biome-methods.patch b/patches/server/0857-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/server/0858-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0857-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0859-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0858-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 94%
rename from patches/server/0859-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0858-Fix-plugin-loggers-on-server-shutdown.patch
index 0b4cd0a831..0f3e2f5937 100644
--- a/patches/server/0859-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0858-Fix-plugin-loggers-on-server-shutdown.patch
@@ -37,10 +37,10 @@ index 0000000000000000000000000000000000000000..c1d3bac79bb8b4796c013ff4472f75dc
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index dbeede822e4534b487d30772280eaac1d5c966f9..365bcfcf667ffa76253b1db5cd06a96e0f3679d5 100644
+index 42f566c9155b70e04d457eb05934d678a92fcdb1..f1b8ebb9718c8ff824d2707a0d1eb08cdcd18f39 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -998,6 +998,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -997,6 +997,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              net.minecrell.terminalconsole.TerminalConsoleAppender.close(); // Paper - Use TerminalConsoleAppender
          } catch (Exception e) {
          }
diff --git a/patches/server/0860-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0859-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 100%
rename from patches/server/0860-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0859-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0861-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0860-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0861-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0860-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0862-Missing-eating-regain-reason.patch b/patches/server/0861-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0862-Missing-eating-regain-reason.patch
rename to patches/server/0861-Missing-eating-regain-reason.patch
diff --git a/patches/server/0863-Missing-effect-cause.patch b/patches/server/0862-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0863-Missing-effect-cause.patch
rename to patches/server/0862-Missing-effect-cause.patch
diff --git a/patches/server/0864-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0863-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0864-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0863-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0865-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0864-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0865-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0864-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0866-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0865-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0866-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0865-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0867-Configurable-chat-thread-limit.patch b/patches/server/0866-Configurable-chat-thread-limit.patch
similarity index 97%
rename from patches/server/0867-Configurable-chat-thread-limit.patch
rename to patches/server/0866-Configurable-chat-thread-limit.patch
index 5e2cdaf62f..666fbf6598 100644
--- a/patches/server/0867-Configurable-chat-thread-limit.patch
+++ b/patches/server/0866-Configurable-chat-thread-limit.patch
@@ -22,7 +22,7 @@ is actually processed, this is honestly really just exposed for the misnomers or
 who just wanna ensure that this won't grow over a specific size if chat gets stupidly active
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index 499b7e84a42517c9a82e27e425a8aefd9ad614ee..d225c35b8a91296d007b92d112639ff76948391e 100644
+index 622684f50a12ddd412e2d6ff305407e7c13684bf..019d3bbd78fb0b06861979d223915fedb6c99442 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -285,13 +285,26 @@ public class GlobalConfiguration extends ConfigurationPart {
diff --git a/patches/server/0868-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0867-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0868-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0867-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0869-fix-Jigsaw-block-kicking-user.patch b/patches/server/0868-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0869-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0868-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0870-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0869-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0870-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0869-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0871-Add-getDrops-to-BlockState.patch b/patches/server/0870-Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/server/0871-Add-getDrops-to-BlockState.patch
rename to patches/server/0870-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0872-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0871-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 100%
rename from patches/server/0872-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0871-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0873-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0872-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 100%
rename from patches/server/0873-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0872-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0874-Fix-custom-piglin-loved-items.patch b/patches/server/0873-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0874-Fix-custom-piglin-loved-items.patch
rename to patches/server/0873-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0875-EntityPickupItemEvent-fixes.patch b/patches/server/0874-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0875-EntityPickupItemEvent-fixes.patch
rename to patches/server/0874-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0876-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0875-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 100%
rename from patches/server/0876-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0875-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0877-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0876-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/server/0877-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0876-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0878-Elder-Guardian-appearance-API.patch b/patches/server/0877-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/server/0878-Elder-Guardian-appearance-API.patch
rename to patches/server/0877-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0879-Allow-changing-bed-s-occupied-property.patch b/patches/server/0878-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0879-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0878-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0880-Add-entity-knockback-API.patch b/patches/server/0879-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0880-Add-entity-knockback-API.patch
rename to patches/server/0879-Add-entity-knockback-API.patch
diff --git a/patches/server/0881-Detect-headless-JREs.patch b/patches/server/0880-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0881-Detect-headless-JREs.patch
rename to patches/server/0880-Detect-headless-JREs.patch
diff --git a/patches/server/0882-fixed-entity-vehicle-collision-event-not-called.patch b/patches/server/0881-fixed-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0882-fixed-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0881-fixed-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0883-optimized-dirt-and-snow-spreading.patch b/patches/server/0882-optimized-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/0883-optimized-dirt-and-snow-spreading.patch
rename to patches/server/0882-optimized-dirt-and-snow-spreading.patch
diff --git a/patches/server/0884-Added-EntityToggleSitEvent.patch b/patches/server/0883-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0884-Added-EntityToggleSitEvent.patch
rename to patches/server/0883-Added-EntityToggleSitEvent.patch
diff --git a/patches/server/0885-Add-fire-tick-delay-option.patch b/patches/server/0884-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0885-Add-fire-tick-delay-option.patch
rename to patches/server/0884-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0886-Add-Moving-Piston-API.patch b/patches/server/0885-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0886-Add-Moving-Piston-API.patch
rename to patches/server/0885-Add-Moving-Piston-API.patch
diff --git a/patches/server/0887-Ignore-impossible-spawn-tick.patch b/patches/server/0886-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0887-Ignore-impossible-spawn-tick.patch
rename to patches/server/0886-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0888-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/server/0887-Track-projectile-source-for-fireworks-from-dispenser.patch
similarity index 100%
rename from patches/server/0888-Track-projectile-source-for-fireworks-from-dispenser.patch
rename to patches/server/0887-Track-projectile-source-for-fireworks-from-dispenser.patch
diff --git a/patches/server/0889-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0888-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0889-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0888-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0890-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0889-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 100%
rename from patches/server/0890-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0889-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0891-Prevent-compass-from-loading-chunks.patch b/patches/server/0890-Prevent-compass-from-loading-chunks.patch
similarity index 100%
rename from patches/server/0891-Prevent-compass-from-loading-chunks.patch
rename to patches/server/0890-Prevent-compass-from-loading-chunks.patch
diff --git a/patches/server/0892-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0891-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0892-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0891-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0893-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0892-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 95%
rename from patches/server/0893-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0892-ensure-reset-EnderDragon-boss-event-name.patch
index 1f9fc08b58..a98c534d61 100644
--- a/patches/server/0893-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/server/0892-ensure-reset-EnderDragon-boss-event-name.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] ensure reset EnderDragon boss event name
 Fix MC-257487
 
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index f67fcaff1994e5eb1195d1ec6d5a27d01c12d7a7..02d5a5b799bfe90993bc6868369d31f43d5b7fd6 100644
+index 294f384326c01d28c28908a56905b925b1b3bd76..c63f05a3d29146bfb8d5c93df5706145e3eaf716 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -73,6 +73,7 @@ public class EndDragonFight {
diff --git a/patches/server/0894-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0893-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0894-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0893-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0895-Add-Player-Warden-Warning-API.patch b/patches/server/0894-Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/server/0895-Add-Player-Warden-Warning-API.patch
rename to patches/server/0894-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0896-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0895-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0896-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0895-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0897-Add-paper-dumplisteners-command.patch b/patches/server/0896-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0897-Add-paper-dumplisteners-command.patch
rename to patches/server/0896-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0898-check-global-player-list-where-appropriate.patch b/patches/server/0897-check-global-player-list-where-appropriate.patch
similarity index 100%
rename from patches/server/0898-check-global-player-list-where-appropriate.patch
rename to patches/server/0897-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0899-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0898-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0899-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0898-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0900-ItemStack-damage-API.patch b/patches/server/0899-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0900-ItemStack-damage-API.patch
rename to patches/server/0899-ItemStack-damage-API.patch
diff --git a/patches/server/0901-Friction-API.patch b/patches/server/0900-Friction-API.patch
similarity index 100%
rename from patches/server/0901-Friction-API.patch
rename to patches/server/0900-Friction-API.patch
diff --git a/patches/server/0902-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0901-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0902-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0901-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0903-Fix-player-kick-on-shutdown.patch b/patches/server/0902-Fix-player-kick-on-shutdown.patch
similarity index 100%
rename from patches/server/0903-Fix-player-kick-on-shutdown.patch
rename to patches/server/0902-Fix-player-kick-on-shutdown.patch
diff --git a/patches/server/0904-Sync-offhand-slot-in-menus.patch b/patches/server/0903-Sync-offhand-slot-in-menus.patch
similarity index 100%
rename from patches/server/0904-Sync-offhand-slot-in-menus.patch
rename to patches/server/0903-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0905-Player-Entity-Tracking-Events.patch b/patches/server/0904-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/server/0905-Player-Entity-Tracking-Events.patch
rename to patches/server/0904-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0906-Limit-pet-look-distance.patch b/patches/server/0905-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0906-Limit-pet-look-distance.patch
rename to patches/server/0905-Limit-pet-look-distance.patch
diff --git a/patches/server/0907-Properly-resend-entities.patch b/patches/server/0906-Properly-resend-entities.patch
similarity index 100%
rename from patches/server/0907-Properly-resend-entities.patch
rename to patches/server/0906-Properly-resend-entities.patch
diff --git a/patches/server/0908-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0907-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0908-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0907-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0909-fix-Instruments.patch b/patches/server/0908-fix-Instruments.patch
similarity index 100%
rename from patches/server/0909-fix-Instruments.patch
rename to patches/server/0908-fix-Instruments.patch
diff --git a/patches/server/0910-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0909-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0910-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0909-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0911-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0910-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0911-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0910-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0912-Add-BlockLockCheckEvent.patch b/patches/server/0911-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0912-Add-BlockLockCheckEvent.patch
rename to patches/server/0911-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0913-Add-Sneaking-API-for-Entities.patch b/patches/server/0912-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0913-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0912-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0914-Improve-logging-and-errors.patch b/patches/server/0913-Improve-logging-and-errors.patch
similarity index 82%
rename from patches/server/0914-Improve-logging-and-errors.patch
rename to patches/server/0913-Improve-logging-and-errors.patch
index be32ff3b20..8622471fd1 100644
--- a/patches/server/0914-Improve-logging-and-errors.patch
+++ b/patches/server/0913-Improve-logging-and-errors.patch
@@ -4,23 +4,6 @@ Date: Wed, 14 Dec 2022 15:52:11 -0800
 Subject: [PATCH] Improve logging and errors
 
 
-diff --git a/src/main/java/net/minecraft/server/dedicated/Settings.java b/src/main/java/net/minecraft/server/dedicated/Settings.java
-index f6e423a76d4c9cf639f1d44af80d33cf3072f6b5..135fc81414446f24c3adad71f5199c7898a6c1cd 100644
---- a/src/main/java/net/minecraft/server/dedicated/Settings.java
-+++ b/src/main/java/net/minecraft/server/dedicated/Settings.java
-@@ -49,6 +49,12 @@ public abstract class Settings<T extends Settings<T>> {
-     }
- 
-     public static Properties loadFromFile(Path path) {
-+        // Paper start
-+        if (Files.notExists(path)) {
-+            LOGGER.info("Could not find existing {}. Creating with default values...", path.getFileName());
-+            return new Properties();
-+        }
-+        // Paper end
-         try {
-             Properties properties;
-             Properties properties1;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 index dbc93883b8529b0aab3ea21ddd466bc8c3739351..d7a4e200853f4eb980f1ea4a5c6a338039979cf1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
diff --git a/patches/server/0915-Improve-PortalEvents.patch b/patches/server/0914-Improve-PortalEvents.patch
similarity index 93%
rename from patches/server/0915-Improve-PortalEvents.patch
rename to patches/server/0914-Improve-PortalEvents.patch
index 2ddc3d8b5e..1f0376edf0 100644
--- a/patches/server/0915-Improve-PortalEvents.patch
+++ b/patches/server/0914-Improve-PortalEvents.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Improve PortalEvents
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 58eb0a7be2e5b4dd2aba8aebc0f7a57ff1348135..6fd0e3556f771464854bd8477163ced7b10b0fc4 100644
+index 32093c96a22221f17411aaf260db071f27350966..9eb0cf5518ee29550526736acef6cbbf8912d6af 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3674,7 +3674,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0916-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0915-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 96%
rename from patches/server/0916-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0915-Add-config-option-for-spider-worldborder-climbing.patch
index 083f8bc89c..b664ea2d72 100644
--- a/patches/server/0916-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0915-Add-config-option-for-spider-worldborder-climbing.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add config option for spider worldborder climbing
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6fd0e3556f771464854bd8477163ced7b10b0fc4..c0b23dc9f06655bc8ff447e0960404ce234b9b7e 100644
+index 9eb0cf5518ee29550526736acef6cbbf8912d6af..ca93f7a5484fb93cdfb6bb7749ffbaefb6f43042 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -403,6 +403,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0917-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0916-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 100%
rename from patches/server/0917-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0916-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0918-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0917-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0918-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0917-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0919-Flying-Fall-Damage.patch b/patches/server/0918-Flying-Fall-Damage.patch
similarity index 100%
rename from patches/server/0919-Flying-Fall-Damage.patch
rename to patches/server/0918-Flying-Fall-Damage.patch
diff --git a/patches/server/0920-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0919-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
similarity index 100%
rename from patches/server/0920-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
rename to patches/server/0919-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/server/0921-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0920-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 91%
rename from patches/server/0921-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0920-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index a44797742c..f8b90bcc91 100644
--- a/patches/server/0921-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0920-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose pre-collision moving velocity to
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index c0b23dc9f06655bc8ff447e0960404ce234b9b7e..a16d3c98f73d96aa7b0a7e72791c45a125bf84eb 100644
+index ca93f7a5484fb93cdfb6bb7749ffbaefb6f43042..d9f6b0e0b20f4106ffead6b773b5489b71924c61 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1156,7 +1156,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0922-config-for-disabling-entity-tag-tags.patch b/patches/server/0921-config-for-disabling-entity-tag-tags.patch
similarity index 100%
rename from patches/server/0922-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0921-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0923-Use-single-player-info-update-packet-on-join.patch b/patches/server/0922-Use-single-player-info-update-packet-on-join.patch
similarity index 100%
rename from patches/server/0923-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0922-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0924-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0923-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 100%
rename from patches/server/0924-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0923-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0925-Win-Screen-API.patch b/patches/server/0924-Win-Screen-API.patch
similarity index 100%
rename from patches/server/0925-Win-Screen-API.patch
rename to patches/server/0924-Win-Screen-API.patch
diff --git a/patches/server/0926-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0925-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 93%
rename from patches/server/0926-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0925-Remove-CraftItemStack-setAmount-null-assignment.patch
index b85d1dc31d..771edbbe74 100644
--- a/patches/server/0926-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0925-Remove-CraftItemStack-setAmount-null-assignment.patch
@@ -16,7 +16,7 @@ with less than zero amounts, so this code doesn't create
 a problem with operations on the vanilla ItemStack.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 28e6933e5b02d1d2f983968692bffa2b9e572051..ce82f313007762b6d1d9f006f21a8858e2976efb 100644
+index 3f0c1edcc6bf57a72942b4680fccf27c68ea0a44..dc524fd22ce5f9298e3d73b05d72c1ef7459d9ea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -157,7 +157,7 @@ public final class CraftItemStack extends ItemStack {
diff --git a/patches/server/0927-Fix-force-opening-enchantment-tables.patch b/patches/server/0926-Fix-force-opening-enchantment-tables.patch
similarity index 100%
rename from patches/server/0927-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0926-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0928-Add-Entity-Body-Yaw-API.patch b/patches/server/0927-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/server/0928-Add-Entity-Body-Yaw-API.patch
rename to patches/server/0927-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0929-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0928-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
similarity index 100%
rename from patches/server/0929-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
rename to patches/server/0928-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0930-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/server/0929-Update-the-flag-when-a-captured-block-state-is-outda.patch
similarity index 100%
rename from patches/server/0930-Update-the-flag-when-a-captured-block-state-is-outda.patch
rename to patches/server/0929-Update-the-flag-when-a-captured-block-state-is-outda.patch
diff --git a/patches/server/0931-Add-EntityFertilizeEggEvent.patch b/patches/server/0930-Add-EntityFertilizeEggEvent.patch
similarity index 100%
rename from patches/server/0931-Add-EntityFertilizeEggEvent.patch
rename to patches/server/0930-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0932-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0931-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
similarity index 100%
rename from patches/server/0932-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
rename to patches/server/0931-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0933-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0932-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/server/0933-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/server/0932-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0934-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0933-Correctly-handle-ArmorStand-invisibility.patch
similarity index 100%
rename from patches/server/0934-Correctly-handle-ArmorStand-invisibility.patch
rename to patches/server/0933-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0935-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0934-Fix-advancement-triggers-for-entity-damage.patch
similarity index 100%
rename from patches/server/0935-Fix-advancement-triggers-for-entity-damage.patch
rename to patches/server/0934-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0936-Fix-text-display-error-on-spawn.patch b/patches/server/0935-Fix-text-display-error-on-spawn.patch
similarity index 100%
rename from patches/server/0936-Fix-text-display-error-on-spawn.patch
rename to patches/server/0935-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0937-Fix-certain-inventories-returning-null-Locations.patch b/patches/server/0936-Fix-certain-inventories-returning-null-Locations.patch
similarity index 100%
rename from patches/server/0937-Fix-certain-inventories-returning-null-Locations.patch
rename to patches/server/0936-Fix-certain-inventories-returning-null-Locations.patch
diff --git a/patches/server/0938-Add-Shearable-API.patch b/patches/server/0937-Add-Shearable-API.patch
similarity index 100%
rename from patches/server/0938-Add-Shearable-API.patch
rename to patches/server/0937-Add-Shearable-API.patch
diff --git a/patches/server/0939-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0938-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/server/0939-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/server/0938-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0940-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/server/0939-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
similarity index 100%
rename from patches/server/0940-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
rename to patches/server/0939-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch
diff --git a/patches/server/0941-Optimize-Hoppers.patch b/patches/server/0940-Optimize-Hoppers.patch
similarity index 99%
rename from patches/server/0941-Optimize-Hoppers.patch
rename to patches/server/0940-Optimize-Hoppers.patch
index 1d70f3b9b5..329850cf7b 100644
--- a/patches/server/0941-Optimize-Hoppers.patch
+++ b/patches/server/0940-Optimize-Hoppers.patch
@@ -13,10 +13,10 @@ Subject: [PATCH] Optimize Hoppers
 * Remove Streams from Item Suck In and restore restore 1.12 AABB checks which is simpler and no voxel allocations (was doing TWO Item Suck ins)
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 365bcfcf667ffa76253b1db5cd06a96e0f3679d5..ae9b78c4e321eb811ee87e1827d3684371977609 100644
+index f1b8ebb9718c8ff824d2707a0d1eb08cdcd18f39..b31470c4caeb1bd29b99bfafea90bf10d714568c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1522,6 +1522,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1521,6 +1521,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
              worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
diff --git a/patches/server/0942-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0941-Fix-beehives-generating-from-using-bonemeal.patch
similarity index 100%
rename from patches/server/0942-Fix-beehives-generating-from-using-bonemeal.patch
rename to patches/server/0941-Fix-beehives-generating-from-using-bonemeal.patch
diff --git a/patches/server/0943-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0942-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
similarity index 100%
rename from patches/server/0943-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
rename to patches/server/0942-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0944-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0943-Treat-sequence-violations-like-they-should-be.patch
similarity index 100%
rename from patches/server/0944-Treat-sequence-violations-like-they-should-be.patch
rename to patches/server/0943-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0945-remove-duplicate-animate-packet-for-records.patch b/patches/server/0944-remove-duplicate-animate-packet-for-records.patch
similarity index 100%
rename from patches/server/0945-remove-duplicate-animate-packet-for-records.patch
rename to patches/server/0944-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0946-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0945-Prevent-causing-expired-keys-from-impacting-new-join.patch
similarity index 100%
rename from patches/server/0946-Prevent-causing-expired-keys-from-impacting-new-join.patch
rename to patches/server/0945-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0947-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0946-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
similarity index 100%
rename from patches/server/0947-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
rename to patches/server/0946-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0948-Use-array-for-gamerule-storage.patch b/patches/server/0947-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0948-Use-array-for-gamerule-storage.patch
rename to patches/server/0947-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0949-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0948-Fix-a-couple-of-upstream-bed-issues.patch
similarity index 100%
rename from patches/server/0949-Fix-a-couple-of-upstream-bed-issues.patch
rename to patches/server/0948-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0950-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0949-Fix-demo-flag-not-enabling-demo-mode.patch
similarity index 100%
rename from patches/server/0950-Fix-demo-flag-not-enabling-demo-mode.patch
rename to patches/server/0949-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0951-Add-Mob-Experience-reward-API.patch b/patches/server/0950-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/server/0951-Add-Mob-Experience-reward-API.patch
rename to patches/server/0950-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0952-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0951-Break-redstone-on-top-of-trap-doors-early.patch
similarity index 100%
rename from patches/server/0952-Break-redstone-on-top-of-trap-doors-early.patch
rename to patches/server/0951-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0953-Fix-DamageCause-for-Falling-Blocks.patch b/patches/server/0952-Fix-DamageCause-for-Falling-Blocks.patch
similarity index 100%
rename from patches/server/0953-Fix-DamageCause-for-Falling-Blocks.patch
rename to patches/server/0952-Fix-DamageCause-for-Falling-Blocks.patch
diff --git a/patches/server/0954-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0953-Avoid-Lazy-Initialization-for-Enum-Fields.patch
similarity index 100%
rename from patches/server/0954-Avoid-Lazy-Initialization-for-Enum-Fields.patch
rename to patches/server/0953-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0955-More-accurate-isInOpenWater-impl.patch b/patches/server/0954-More-accurate-isInOpenWater-impl.patch
similarity index 100%
rename from patches/server/0955-More-accurate-isInOpenWater-impl.patch
rename to patches/server/0954-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0956-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/server/0955-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
similarity index 100%
rename from patches/server/0956-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
rename to patches/server/0955-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch
diff --git a/patches/server/0957-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/server/0956-Optimise-recalcBlockCounts-for-empty-sections.patch
similarity index 100%
rename from patches/server/0957-Optimise-recalcBlockCounts-for-empty-sections.patch
rename to patches/server/0956-Optimise-recalcBlockCounts-for-empty-sections.patch
diff --git a/patches/server/0958-Fix-destroying-beehive-without-any-players-nearby-th.patch b/patches/server/0957-Fix-destroying-beehive-without-any-players-nearby-th.patch
similarity index 100%
rename from patches/server/0958-Fix-destroying-beehive-without-any-players-nearby-th.patch
rename to patches/server/0957-Fix-destroying-beehive-without-any-players-nearby-th.patch
diff --git a/patches/server/0959-Expand-PlayerItemMendEvent.patch b/patches/server/0958-Expand-PlayerItemMendEvent.patch
similarity index 100%
rename from patches/server/0959-Expand-PlayerItemMendEvent.patch
rename to patches/server/0958-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0960-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0959-Refresh-ProjectileSource-for-projectiles.patch
similarity index 97%
rename from patches/server/0960-Refresh-ProjectileSource-for-projectiles.patch
rename to patches/server/0959-Refresh-ProjectileSource-for-projectiles.patch
index f5706429d5..4ca39169ca 100644
--- a/patches/server/0960-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0959-Refresh-ProjectileSource-for-projectiles.patch
@@ -9,7 +9,7 @@ Previously, after the entity reloaded, Projectile#getShooter
 would return null, while the entity still had an owner.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a16d3c98f73d96aa7b0a7e72791c45a125bf84eb..c014fe8808f19195d8c26925227ff28bd6738039 100644
+index d9f6b0e0b20f4106ffead6b773b5489b71924c61..cf9393dd02565134a1ce428e84a9f26ac2d39a0d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -382,6 +382,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0961-Add-transient-modifier-API.patch b/patches/server/0960-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/server/0961-Add-transient-modifier-API.patch
rename to patches/server/0960-Add-transient-modifier-API.patch
diff --git a/patches/server/0962-Fix-block-place-logic.patch b/patches/server/0961-Fix-block-place-logic.patch
similarity index 100%
rename from patches/server/0962-Fix-block-place-logic.patch
rename to patches/server/0961-Fix-block-place-logic.patch
diff --git a/patches/server/0963-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0962-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
similarity index 100%
rename from patches/server/0963-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
rename to patches/server/0962-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0964-Ignore-inline-definitions-of-trim-material-pattern.patch b/patches/server/0963-Ignore-inline-definitions-of-trim-material-pattern.patch
similarity index 100%
rename from patches/server/0964-Ignore-inline-definitions-of-trim-material-pattern.patch
rename to patches/server/0963-Ignore-inline-definitions-of-trim-material-pattern.patch
diff --git a/patches/server/0965-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0964-Call-BlockGrowEvent-for-missing-blocks.patch
similarity index 100%
rename from patches/server/0965-Call-BlockGrowEvent-for-missing-blocks.patch
rename to patches/server/0964-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0966-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0965-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
similarity index 100%
rename from patches/server/0966-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
rename to patches/server/0965-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0967-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0966-fix-MapLike-spam-for-missing-key-selector.patch
similarity index 100%
rename from patches/server/0967-fix-MapLike-spam-for-missing-key-selector.patch
rename to patches/server/0966-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0968-Fix-sniffer-removeExploredLocation.patch b/patches/server/0967-Fix-sniffer-removeExploredLocation.patch
similarity index 100%
rename from patches/server/0968-Fix-sniffer-removeExploredLocation.patch
rename to patches/server/0967-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0969-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0968-Add-method-to-remove-all-active-potion-effects.patch
similarity index 100%
rename from patches/server/0969-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/server/0968-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0970-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch b/patches/server/0969-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
similarity index 100%
rename from patches/server/0970-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
rename to patches/server/0969-Temp-Pre-init-PlayerChunkLoaderData-in-order-to-prep.patch
diff --git a/patches/server/0971-Folia-scheduler-and-owned-region-API.patch b/patches/server/0970-Folia-scheduler-and-owned-region-API.patch
similarity index 99%
rename from patches/server/0971-Folia-scheduler-and-owned-region-API.patch
rename to patches/server/0970-Folia-scheduler-and-owned-region-API.patch
index 66ea9c3d03..0b3c35bf55 100644
--- a/patches/server/0971-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0970-Folia-scheduler-and-owned-region-API.patch
@@ -1121,10 +1121,10 @@ index 0000000000000000000000000000000000000000..d306f911757a4d556c82c0070d4837db
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ae9b78c4e321eb811ee87e1827d3684371977609..435f5ee3388f5da93df938c43ea2578f7d586407 100644
+index b31470c4caeb1bd29b99bfafea90bf10d714568c..67ee3a4ca8a6cdeb275653d492a1fea8037c51fb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1479,6 +1479,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1478,6 +1478,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          MinecraftTimings.bukkitSchedulerTimer.startTiming(); // Spigot // Paper
          this.server.getScheduler().mainThreadHeartbeat(this.tickCount); // CraftBukkit
          MinecraftTimings.bukkitSchedulerTimer.stopTiming(); // Spigot // Paper
@@ -1305,7 +1305,7 @@ index 144e843191bc955d37ee1524746304fbe0d79149..d62cdda5ef3691a54ce34729920bad8e
          ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
          ConfigurationSerialization.registerClass(CraftPlayerProfile.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 1186ee7cc4671892346b7173d10125febcfbf88a..6e600f9d81178f4ad10967a1aba802c9ac853d82 100644
+index 4c2818f2ab2c53a836622d0ef17b19ecd1762908..71ccd54245c2cfe5e75a53e5d6b2962961eccb6f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -207,6 +207,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0972-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0971-Fix-incorrect-crafting-result-amount-for-fireworks.patch
similarity index 100%
rename from patches/server/0972-Fix-incorrect-crafting-result-amount-for-fireworks.patch
rename to patches/server/0971-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0973-Properly-Cancel-Usable-Items.patch b/patches/server/0972-Properly-Cancel-Usable-Items.patch
similarity index 100%
rename from patches/server/0973-Properly-Cancel-Usable-Items.patch
rename to patches/server/0972-Properly-Cancel-Usable-Items.patch
diff --git a/patches/server/0974-Add-event-for-player-editing-sign.patch b/patches/server/0973-Add-event-for-player-editing-sign.patch
similarity index 100%
rename from patches/server/0974-Add-event-for-player-editing-sign.patch
rename to patches/server/0973-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0975-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0974-Only-tick-item-frames-if-players-can-see-it.patch
similarity index 100%
rename from patches/server/0975-Only-tick-item-frames-if-players-can-see-it.patch
rename to patches/server/0974-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0976-Improve-command-function-perm-level-checks.patch b/patches/server/0975-Improve-command-function-perm-level-checks.patch
similarity index 100%
rename from patches/server/0976-Improve-command-function-perm-level-checks.patch
rename to patches/server/0975-Improve-command-function-perm-level-checks.patch
diff --git a/patches/server/0977-Add-option-to-disable-block-updates.patch b/patches/server/0976-Add-option-to-disable-block-updates.patch
similarity index 100%
rename from patches/server/0977-Add-option-to-disable-block-updates.patch
rename to patches/server/0976-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0978-Call-missing-BlockDispenseEvent.patch b/patches/server/0977-Call-missing-BlockDispenseEvent.patch
similarity index 100%
rename from patches/server/0978-Call-missing-BlockDispenseEvent.patch
rename to patches/server/0977-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0979-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0978-Don-t-load-chunks-for-supporting-block-checks.patch
similarity index 90%
rename from patches/server/0979-Don-t-load-chunks-for-supporting-block-checks.patch
rename to patches/server/0978-Don-t-load-chunks-for-supporting-block-checks.patch
index 4ec90953d4..c5cba7f542 100644
--- a/patches/server/0979-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0978-Don-t-load-chunks-for-supporting-block-checks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't load chunks for supporting block checks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ccc674a3da006fc3f6edd3b479eaa86c1cc67e90..2edab21bb271405f200de5a19e9c748bb14aba7d 100644
+index e19010627a030753b08aa8451363c6bc4631bf72..0ed297f189e5d21c497ac78294db6ca664c0f2c4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1368,7 +1368,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0980-Optimize-player-lookups-for-beacons.patch b/patches/server/0979-Optimize-player-lookups-for-beacons.patch
similarity index 100%
rename from patches/server/0980-Optimize-player-lookups-for-beacons.patch
rename to patches/server/0979-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0981-Add-Sign-getInteractableSideFor.patch b/patches/server/0980-Add-Sign-getInteractableSideFor.patch
similarity index 100%
rename from patches/server/0981-Add-Sign-getInteractableSideFor.patch
rename to patches/server/0980-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0982-Array-backed-synched-entity-data.patch b/patches/server/0981-Array-backed-synched-entity-data.patch
similarity index 100%
rename from patches/server/0982-Array-backed-synched-entity-data.patch
rename to patches/server/0981-Array-backed-synched-entity-data.patch
diff --git a/patches/server/0983-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0982-fix-item-meta-for-tadpole-buckets.patch
similarity index 100%
rename from patches/server/0983-fix-item-meta-for-tadpole-buckets.patch
rename to patches/server/0982-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0984-Suppress-Item-Meta-Validation-Checks.patch b/patches/server/0983-Suppress-Item-Meta-Validation-Checks.patch
similarity index 100%
rename from patches/server/0984-Suppress-Item-Meta-Validation-Checks.patch
rename to patches/server/0983-Suppress-Item-Meta-Validation-Checks.patch
diff --git a/patches/server/0985-Fix-BanList-API.patch b/patches/server/0984-Fix-BanList-API.patch
similarity index 100%
rename from patches/server/0985-Fix-BanList-API.patch
rename to patches/server/0984-Fix-BanList-API.patch
diff --git a/patches/server/0986-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0985-Determine-lava-and-water-fluid-explosion-resistance-.patch
similarity index 100%
rename from patches/server/0986-Determine-lava-and-water-fluid-explosion-resistance-.patch
rename to patches/server/0985-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0987-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0986-Fix-possible-NPE-on-painting-creation.patch
similarity index 100%
rename from patches/server/0987-Fix-possible-NPE-on-painting-creation.patch
rename to patches/server/0986-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0988-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0987-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0988-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0987-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0989-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0988-ExperienceOrb-should-call-EntitySpawnEvent.patch
similarity index 100%
rename from patches/server/0989-ExperienceOrb-should-call-EntitySpawnEvent.patch
rename to patches/server/0988-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0990-Don-t-tick-signs.patch b/patches/server/0989-Don-t-tick-signs.patch
similarity index 100%
rename from patches/server/0990-Don-t-tick-signs.patch
rename to patches/server/0989-Don-t-tick-signs.patch
diff --git a/patches/server/0991-Configurable-Region-Compression-Format.patch b/patches/server/0990-Configurable-Region-Compression-Format.patch
similarity index 100%
rename from patches/server/0991-Configurable-Region-Compression-Format.patch
rename to patches/server/0990-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0992-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0991-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
similarity index 100%
rename from patches/server/0992-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
rename to patches/server/0991-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0993-Add-whitelist-events.patch b/patches/server/0992-Add-whitelist-events.patch
similarity index 100%
rename from patches/server/0993-Add-whitelist-events.patch
rename to patches/server/0992-Add-whitelist-events.patch
diff --git a/patches/server/0994-Implement-PlayerFailMoveEvent.patch b/patches/server/0993-Implement-PlayerFailMoveEvent.patch
similarity index 100%
rename from patches/server/0994-Implement-PlayerFailMoveEvent.patch
rename to patches/server/0993-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0995-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0994-Only-erase-allay-memory-on-non-item-targets.patch
similarity index 100%
rename from patches/server/0995-Only-erase-allay-memory-on-non-item-targets.patch
rename to patches/server/0994-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0996-API-for-updating-recipes-on-clients.patch b/patches/server/0995-API-for-updating-recipes-on-clients.patch
similarity index 100%
rename from patches/server/0996-API-for-updating-recipes-on-clients.patch
rename to patches/server/0995-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0997-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0996-Fix-rotation-when-spawning-display-entities.patch
similarity index 100%
rename from patches/server/0997-Fix-rotation-when-spawning-display-entities.patch
rename to patches/server/0996-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0998-Only-capture-actual-tree-growth.patch b/patches/server/0997-Only-capture-actual-tree-growth.patch
similarity index 100%
rename from patches/server/0998-Only-capture-actual-tree-growth.patch
rename to patches/server/0997-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0999-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0998-Use-correct-source-for-mushroom-block-spread-event.patch
similarity index 100%
rename from patches/server/0999-Use-correct-source-for-mushroom-block-spread-event.patch
rename to patches/server/0998-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/1000-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0999-Respect-randomizeData-on-more-entities-when-spawning.patch
similarity index 100%
rename from patches/server/1000-Respect-randomizeData-on-more-entities-when-spawning.patch
rename to patches/server/0999-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/1001-Use-correct-seed-on-api-world-load.patch b/patches/server/1000-Use-correct-seed-on-api-world-load.patch
similarity index 100%
rename from patches/server/1001-Use-correct-seed-on-api-world-load.patch
rename to patches/server/1000-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/1002-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/1001-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
similarity index 100%
rename from patches/server/1002-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
rename to patches/server/1001-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/1003-Cache-map-ids-on-item-frames.patch b/patches/server/1002-Cache-map-ids-on-item-frames.patch
similarity index 100%
rename from patches/server/1003-Cache-map-ids-on-item-frames.patch
rename to patches/server/1002-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/1004-Fix-custom-statistic-criteria-creation.patch b/patches/server/1003-Fix-custom-statistic-criteria-creation.patch
similarity index 100%
rename from patches/server/1004-Fix-custom-statistic-criteria-creation.patch
rename to patches/server/1003-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/1005-Bandaid-fix-for-Effect.patch b/patches/server/1004-Bandaid-fix-for-Effect.patch
similarity index 100%
rename from patches/server/1005-Bandaid-fix-for-Effect.patch
rename to patches/server/1004-Bandaid-fix-for-Effect.patch
diff --git a/patches/server/1006-SculkCatalyst-bloom-API.patch b/patches/server/1005-SculkCatalyst-bloom-API.patch
similarity index 100%
rename from patches/server/1006-SculkCatalyst-bloom-API.patch
rename to patches/server/1005-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/1007-API-for-an-entity-s-scoreboard-name.patch b/patches/server/1006-API-for-an-entity-s-scoreboard-name.patch
similarity index 100%
rename from patches/server/1007-API-for-an-entity-s-scoreboard-name.patch
rename to patches/server/1006-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/1008-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/1007-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
similarity index 100%
rename from patches/server/1008-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
rename to patches/server/1007-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/1009-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/1008-Deprecate-and-replace-methods-with-old-StructureType.patch
similarity index 100%
rename from patches/server/1009-Deprecate-and-replace-methods-with-old-StructureType.patch
rename to patches/server/1008-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/1010-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/1009-Don-t-tab-complete-namespaced-commands-if-send-names.patch
similarity index 100%
rename from patches/server/1010-Don-t-tab-complete-namespaced-commands-if-send-names.patch
rename to patches/server/1009-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/1011-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/1010-Properly-handle-BlockBreakEvent-isDropItems.patch
similarity index 100%
rename from patches/server/1011-Properly-handle-BlockBreakEvent-isDropItems.patch
rename to patches/server/1010-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/1012-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/1011-Fire-entity-death-event-for-ender-dragon.patch
similarity index 100%
rename from patches/server/1012-Fire-entity-death-event-for-ender-dragon.patch
rename to patches/server/1011-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/1013-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/1012-Configurable-entity-tracking-range-by-Y-coordinate.patch
similarity index 100%
rename from patches/server/1013-Configurable-entity-tracking-range-by-Y-coordinate.patch
rename to patches/server/1012-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/1014-Add-Listing-API-for-Player.patch b/patches/server/1013-Add-Listing-API-for-Player.patch
similarity index 100%
rename from patches/server/1014-Add-Listing-API-for-Player.patch
rename to patches/server/1013-Add-Listing-API-for-Player.patch
diff --git a/patches/server/1015-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/server/1014-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
similarity index 100%
rename from patches/server/1015-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
rename to patches/server/1014-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/server/1016-Fix-NPE-on-Boat-getStatus.patch b/patches/server/1015-Fix-NPE-on-Boat-getStatus.patch
similarity index 100%
rename from patches/server/1016-Fix-NPE-on-Boat-getStatus.patch
rename to patches/server/1015-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/1017-Expand-Pose-API.patch b/patches/server/1016-Expand-Pose-API.patch
similarity index 100%
rename from patches/server/1017-Expand-Pose-API.patch
rename to patches/server/1016-Expand-Pose-API.patch
diff --git a/patches/server/1018-More-DragonBattle-API.patch b/patches/server/1017-More-DragonBattle-API.patch
similarity index 100%
rename from patches/server/1018-More-DragonBattle-API.patch
rename to patches/server/1017-More-DragonBattle-API.patch
diff --git a/patches/server/1019-Deep-clone-unhandled-nbt-tags.patch b/patches/server/1018-Deep-clone-unhandled-nbt-tags.patch
similarity index 100%
rename from patches/server/1019-Deep-clone-unhandled-nbt-tags.patch
rename to patches/server/1018-Deep-clone-unhandled-nbt-tags.patch
diff --git a/patches/server/1020-Add-PlayerPickItemEvent.patch b/patches/server/1019-Add-PlayerPickItemEvent.patch
similarity index 100%
rename from patches/server/1020-Add-PlayerPickItemEvent.patch
rename to patches/server/1019-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/1021-Improve-performance-of-mass-crafts.patch b/patches/server/1020-Improve-performance-of-mass-crafts.patch
similarity index 100%
rename from patches/server/1021-Improve-performance-of-mass-crafts.patch
rename to patches/server/1020-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1022-Allow-trident-custom-damage.patch b/patches/server/1021-Allow-trident-custom-damage.patch
similarity index 100%
rename from patches/server/1022-Allow-trident-custom-damage.patch
rename to patches/server/1021-Allow-trident-custom-damage.patch
diff --git a/patches/server/1023-Expose-hand-during-BlockCanBuildEvent.patch b/patches/server/1022-Expose-hand-during-BlockCanBuildEvent.patch
similarity index 100%
rename from patches/server/1023-Expose-hand-during-BlockCanBuildEvent.patch
rename to patches/server/1022-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/server/1024-Optimize-nearest-structure-border-iteration.patch b/patches/server/1023-Optimize-nearest-structure-border-iteration.patch
similarity index 100%
rename from patches/server/1024-Optimize-nearest-structure-border-iteration.patch
rename to patches/server/1023-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/1025-Implement-OfflinePlayer-isConnected.patch b/patches/server/1024-Implement-OfflinePlayer-isConnected.patch
similarity index 100%
rename from patches/server/1025-Implement-OfflinePlayer-isConnected.patch
rename to patches/server/1024-Implement-OfflinePlayer-isConnected.patch
diff --git a/patches/server/1026-Fix-inventory-desync.patch b/patches/server/1025-Fix-inventory-desync.patch
similarity index 100%
rename from patches/server/1026-Fix-inventory-desync.patch
rename to patches/server/1025-Fix-inventory-desync.patch
diff --git a/patches/server/1027-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/1026-Add-titleOverride-to-InventoryOpenEvent.patch
similarity index 100%
rename from patches/server/1027-Add-titleOverride-to-InventoryOpenEvent.patch
rename to patches/server/1026-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/1028-Configure-sniffer-egg-hatch-time.patch b/patches/server/1027-Configure-sniffer-egg-hatch-time.patch
similarity index 100%
rename from patches/server/1028-Configure-sniffer-egg-hatch-time.patch
rename to patches/server/1027-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/1029-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/1028-Do-crystal-portal-proximity-check-before-entity-look.patch
similarity index 100%
rename from patches/server/1029-Do-crystal-portal-proximity-check-before-entity-look.patch
rename to patches/server/1028-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/work/Bukkit b/work/Bukkit
index 82af5dc60e..6b34da8f0c 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 82af5dc60eae0a6223be15ea4f69c560521c97a9
+Subproject commit 6b34da8f0c34fb308c825d3e12abf9cf5bac6ab9
diff --git a/work/CraftBukkit b/work/CraftBukkit
index b76ceb4f5d..db4ba28978 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit b76ceb4f5dbeeedb6e0cff3b4545779b137bc125
+Subproject commit db4ba289785418d608eeca8dec2013e513adf9ad
diff --git a/work/Spigot b/work/Spigot
index 94e187b577..d2eba2c820 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 94e187b577b93759e4f46e85c892049a6baa3bcc
+Subproject commit d2eba2c820b52b742eb542c6d2c4d76e3d743570