794 files changed, 402 insertions, 282 deletions

diff --git a/patches/server/0009-MC-Utils.patch b/patches/server/0009-MC-Utils.patch
index 8ace4e3739..f4ec305721 100644
--- a/patches/server/0009-MC-Utils.patch
+++ b/patches/server/0009-MC-Utils.patch
@@ -4416,18 +4416,10 @@ index 3e5a85a7ad6149b04622c254fbc2e174896a4128..3f662692ed4846e026a9d48595e7b3b2
 +
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 40adb6117b9e0d5f70103113202a07715e403e2a..cef1761cdaf3e456695f2de61f4295fb99361914 100644
+index 40adb6117b9e0d5f70103113202a07715e403e2a..c9cab509796599b13ca3422de1049aed78348704 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
-     public final double[] recentTps = new double[ 3 ];
-     // Spigot end
-     public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations; // Paper - add paper configuration files
-+    public static long currentTickLong = 0L; // Paper - track current tick as a long
- 
-     public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
-         AtomicReference<S> atomicreference = new AtomicReference();
-@@ -973,6 +974,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -973,6 +973,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              MinecraftServer.LOGGER.error("Failed to unlock level {}", this.storageSource.getLevelId(), ioexception1);
          }
          // Spigot start
@@ -4437,15 +4429,7 @@ index 40adb6117b9e0d5f70103113202a07715e403e2a..cef1761cdaf3e456695f2de61f4295fb
          if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) {
              MinecraftServer.LOGGER.info("Saving usercache.json");
              this.getProfileCache().save();
-@@ -1046,6 +1050,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-                     }
-                 }
-                 // Spigot start
-+                ++MinecraftServer.currentTickLong; // Paper - track current tick as a long
-                 if ( tickCount++ % MinecraftServer.SAMPLE_INTERVAL == 0 )
-                 {
-                     long curTime = Util.getMillis();
-@@ -1337,7 +1342,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1337,7 +1340,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              MinecraftServer.LOGGER.debug("Autosave finished");
              SpigotTimings.worldSaveTimer.stopTiming(); // Spigot
          }
diff --git a/patches/server/0010-Adventure.patch b/patches/server/0010-Adventure.patch
index 6ea30f61a7..a30b08aa61 100644
--- a/patches/server/0010-Adventure.patch
+++ b/patches/server/0010-Adventure.patch
@@ -2607,7 +2607,7 @@ index bb97fdb9aa6167083442a928276ebe4225a586ef..eeaa40e8121643c6c1d951e76e7361e2
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cef1761cdaf3e456695f2de61f4295fb99361914..e0b2d474e8d6f2d573d2c1f63e68ba931ecf4eb6 100644
+index c9cab509796599b13ca3422de1049aed78348704..387552877ac82baa3af0da723dbb7c331fad6cf4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -201,6 +201,7 @@ import org.bukkit.craftbukkit.SpigotTimings; // Spigot
@@ -2628,7 +2628,7 @@ index cef1761cdaf3e456695f2de61f4295fb99361914..e0b2d474e8d6f2d573d2c1f63e68ba93
      private int playerIdleTimeout;
      private final long[] tickTimesNanos;
      private long aggregatedTickTimesNanos;
-@@ -1396,7 +1396,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1394,7 +1394,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      private ServerStatus buildServerStatus() {
          ServerStatus.Players serverping_serverpingplayersample = this.buildPlayerStatus();
  
@@ -2637,7 +2637,7 @@ index cef1761cdaf3e456695f2de61f4295fb99361914..e0b2d474e8d6f2d573d2c1f63e68ba93
      }
  
      private ServerStatus.Players buildPlayerStatus() {
-@@ -1428,6 +1428,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1426,6 +1426,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          SpigotTimings.schedulerTimer.startTiming(); // Spigot
          this.server.getScheduler().mainThreadHeartbeat(this.tickCount); // CraftBukkit
          SpigotTimings.schedulerTimer.stopTiming(); // Spigot
@@ -2645,7 +2645,7 @@ index cef1761cdaf3e456695f2de61f4295fb99361914..e0b2d474e8d6f2d573d2c1f63e68ba93
          this.profiler.push("commandFunctions");
          SpigotTimings.commandFunctionsTimer.startTiming(); // Spigot
          this.getFunctions().tick();
-@@ -1799,10 +1800,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1797,10 +1798,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @Override
      public String getMotd() {
@@ -2667,7 +2667,7 @@ index cef1761cdaf3e456695f2de61f4295fb99361914..e0b2d474e8d6f2d573d2c1f63e68ba93
          this.motd = motd;
      }
  
-@@ -2564,23 +2575,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2562,23 +2573,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void logChatMessage(Component message, ChatType.Bound params, @Nullable String prefix) {
diff --git a/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch
index f2b824516b..a82fae195e 100644
--- a/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -260,7 +260,7 @@ index 8323f135d6bf2e1f12525e05094ffa3f2420e7e1..a143ea1e58464a3122fbd8ccafe417bd
      }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e0b2d474e8d6f2d573d2c1f63e68ba931ecf4eb6..91800791427e9362baf68ca3cffda5bfa58de2b8 100644
+index 387552877ac82baa3af0da723dbb7c331fad6cf4..b334cfc9b98d96f9bfba1d5b14c03c336d30ff23 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -154,7 +154,7 @@ import com.mojang.serialization.Dynamic;
@@ -280,7 +280,7 @@ index e0b2d474e8d6f2d573d2c1f63e68ba931ecf4eb6..91800791427e9362baf68ca3cffda5bf
      public static int currentTick = (int) (System.currentTimeMillis() / 50);
      public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
      public int autosavePeriod;
-@@ -384,7 +383,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -383,7 +382,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.options = options;
          this.worldLoader = worldLoader;
          this.vanillaCommandDispatcher = worldstem.dataPackResources().commands; // CraftBukkit
@@ -290,7 +290,7 @@ index e0b2d474e8d6f2d573d2c1f63e68ba931ecf4eb6..91800791427e9362baf68ca3cffda5bf
          if (System.console() == null && System.getProperty("jline.terminal") == null) {
              System.setProperty("jline.terminal", "jline.UnsupportedTerminal");
              Main.useJline = false;
-@@ -405,6 +406,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -404,6 +405,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  MinecraftServer.LOGGER.warn((String) null, ex);
              }
          }
@@ -299,7 +299,7 @@ index e0b2d474e8d6f2d573d2c1f63e68ba931ecf4eb6..91800791427e9362baf68ca3cffda5bf
          Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
          // CraftBukkit end
          this.paperConfigurations = services.paperConfigurations(); // Paper - add paper configuration files
-@@ -1120,7 +1123,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1118,7 +1121,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  org.spigotmc.WatchdogThread.doStop(); // Spigot
                  // CraftBukkit start - Restore terminal to original settings
                  try {
@@ -308,7 +308,7 @@ index e0b2d474e8d6f2d573d2c1f63e68ba931ecf4eb6..91800791427e9362baf68ca3cffda5bf
                  } catch (Exception ignored) {
                  }
                  // CraftBukkit end
-@@ -1658,7 +1661,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1656,7 +1659,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @Override
      public void sendSystemMessage(Component message) {
@@ -396,7 +396,7 @@ index e9109526880159e2341cc97b53939ba2bcfaeaf9..9dcfcea63f57f45a5584bb80c34fe445
  
          this.bans = new UserBanList(PlayerList.USERBANLIST_FILE);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bec1fdabbc3727c1f7297b2d23914a5179f4adcb..17df1085e29429b202a6f9003343b15b15e2f8f7 100644
+index ee0fbba1ae29bb809303ccc09f64d48c54d426cb..c6cc48c955f052d8f98e3b28c80910b299467480 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -43,7 +43,7 @@ import java.util.logging.Level;
diff --git a/patches/server/0020-Plugin-remapping.patch b/patches/server/0020-Plugin-remapping.patch
index cebc8c0281..cbc4da10c3 100644
--- a/patches/server/0020-Plugin-remapping.patch
+++ b/patches/server/0020-Plugin-remapping.patch
@@ -1553,10 +1553,10 @@ index 0000000000000000000000000000000000000000..badff5d6ae6dd8d209c82bc7e8afe370
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 91800791427e9362baf68ca3cffda5bfa58de2b8..5a4cdbc4b92a48c614564e4e421f05a9eb5b072b 100644
+index b334cfc9b98d96f9bfba1d5b14c03c336d30ff23..e880543e94189fea3ba62eb7fb05ff48bc425299 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -643,6 +643,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -642,6 +642,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
  
          this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD);
@@ -1564,7 +1564,7 @@ index 91800791427e9362baf68ca3cffda5bfa58de2b8..5a4cdbc4b92a48c614564e4e421f05a9
          this.server.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.STARTUP));
          this.connection.acceptConnections();
      }
-@@ -916,6 +917,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -915,6 +916,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.server.disablePlugins();
          }
          // CraftBukkit end
@@ -1904,7 +1904,7 @@ index 0000000000000000000000000000000000000000..73b20a92f330311e3fef8f03b51a0985
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b532c72ec2c048554e496b4b63afa0e9f9932416..7839e34cbd42e1b77c533b0dede42e0a19daf2a4 100644
+index 69175337d14e0b14ddbc2a01a1deb860ae488d36..25a03307a576368f417f1ec3f44213ed469dcd71 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1000,6 +1000,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0023-Timings-v2.patch b/patches/server/0023-Timings-v2.patch
index 5bce386799..3531e3add1 100644
--- a/patches/server/0023-Timings-v2.patch
+++ b/patches/server/0023-Timings-v2.patch
@@ -714,7 +714,7 @@ index f7197f1347251a37dd0f6d9ffa2f09bc3a4e1233..d0d36a57ec4896bcb74970f8fb24d8f3
                      } catch (Exception exception) {
                          if (exception instanceof ReportedException) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5a4cdbc4b92a48c614564e4e421f05a9eb5b072b..d76dae9ce9022308b316080ac48b7030d674cc6b 100644
+index e880543e94189fea3ba62eb7fb05ff48bc425299..49de4625c57689a3624ed421c0b03512507c97c3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -196,7 +196,7 @@ import org.bukkit.craftbukkit.Main;
@@ -726,7 +726,7 @@ index 5a4cdbc4b92a48c614564e4e421f05a9eb5b072b..d76dae9ce9022308b316080ac48b7030
  
  public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements ServerInfo, ChunkIOErrorReporter, CommandSource, AutoCloseable {
  
-@@ -912,6 +912,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -911,6 +911,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
  
          MinecraftServer.LOGGER.info("Stopping server");
@@ -734,7 +734,7 @@ index 5a4cdbc4b92a48c614564e4e421f05a9eb5b072b..d76dae9ce9022308b316080ac48b7030
          // CraftBukkit start
          if (this.server != null) {
              this.server.disablePlugins();
-@@ -1189,9 +1190,21 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1187,9 +1188,21 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      private boolean haveTime() {
          // CraftBukkit start
@@ -756,7 +756,7 @@ index 5a4cdbc4b92a48c614564e4e421f05a9eb5b072b..d76dae9ce9022308b316080ac48b7030
      private void executeModerately() {
          this.runAllTasks();
          java.util.concurrent.locks.LockSupport.parkNanos("executing tasks", 1000L);
-@@ -1220,9 +1233,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1218,9 +1231,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      protected void waitUntilNextTick() {
@@ -768,7 +768,7 @@ index 5a4cdbc4b92a48c614564e4e421f05a9eb5b072b..d76dae9ce9022308b316080ac48b7030
          });
      }
  
-@@ -1323,9 +1336,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1321,9 +1334,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void tickServer(BooleanSupplier shouldKeepTicking) {
@@ -787,7 +787,7 @@ index 5a4cdbc4b92a48c614564e4e421f05a9eb5b072b..d76dae9ce9022308b316080ac48b7030
          ++this.tickCount;
          this.tickRateManager.tick();
          this.tickChildren(shouldKeepTicking);
-@@ -1339,14 +1360,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1337,14 +1358,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (this.autosavePeriod > 0 && this.ticksUntilAutosave <= 0) {
              this.ticksUntilAutosave = this.autosavePeriod;
              // CraftBukkit end
@@ -807,7 +807,7 @@ index 5a4cdbc4b92a48c614564e4e421f05a9eb5b072b..d76dae9ce9022308b316080ac48b7030
          this.profiler.push("tallying");
          long j = Util.getNanos() - i;
          int k = this.tickCount % 100;
-@@ -1358,8 +1382,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1356,8 +1380,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.logTickMethodTime(i);
          this.profiler.pop();
          org.spigotmc.WatchdogThread.tick(); // Spigot
@@ -817,7 +817,7 @@ index 5a4cdbc4b92a48c614564e4e421f05a9eb5b072b..d76dae9ce9022308b316080ac48b7030
      }
  
      private void logTickMethodTime(long tickStartTime) {
-@@ -1430,26 +1453,26 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1428,26 +1451,26 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.getPlayerList().getPlayers().forEach((entityplayer) -> {
              entityplayer.connection.suspendFlushing();
          });
@@ -851,7 +851,7 @@ index 5a4cdbc4b92a48c614564e4e421f05a9eb5b072b..d76dae9ce9022308b316080ac48b7030
          // 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) {
-@@ -1457,7 +1480,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1455,7 +1478,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
              }
          }
@@ -860,7 +860,7 @@ index 5a4cdbc4b92a48c614564e4e421f05a9eb5b072b..d76dae9ce9022308b316080ac48b7030
  
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
-@@ -1493,24 +1516,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1491,24 +1514,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
  
          this.profiler.popPush("connection");
diff --git a/patches/server/0024-Further-improve-server-tick-loop.patch b/patches/server/0024-Further-improve-server-tick-loop.patch
index 03bcb73a6e..bd699ed3ce 100644
--- a/patches/server/0024-Further-improve-server-tick-loop.patch
+++ b/patches/server/0024-Further-improve-server-tick-loop.patch
@@ -12,7 +12,7 @@ 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 d76dae9ce9022308b316080ac48b7030d674cc6b..e9d56d75b7c648f04d3a56942b2866090c570129 100644
+index 49de4625c57689a3624ed421c0b03512507c97c3..46e03617bb32e4037d700c1b3698d397bd75de5c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -296,7 +296,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -34,7 +34,7 @@ index d76dae9ce9022308b316080ac48b7030d674cc6b..e9d56d75b7c648f04d3a56942b286609
      public final double[] recentTps = new double[ 3 ];
      // Spigot end
      public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations; // Paper - add paper configuration files
-@@ -1020,6 +1021,57 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1019,6 +1020,57 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      {
          return ( avg * exp ) + ( tps * ( 1 - exp ) );
      }
@@ -92,7 +92,7 @@ index d76dae9ce9022308b316080ac48b7030d674cc6b..e9d56d75b7c648f04d3a56942b286609
      // Spigot End
  
      protected void runServer() {
-@@ -1034,7 +1086,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1033,7 +1085,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
              // Spigot start
              Arrays.fill( this.recentTps, 20 );
@@ -104,10 +104,10 @@ index d76dae9ce9022308b316080ac48b7030d674cc6b..e9d56d75b7c648f04d3a56942b286609
              while (this.running) {
                  long i;
  
-@@ -1057,15 +1112,22 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1055,15 +1110,22 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+                     }
                  }
                  // Spigot start
-                 ++MinecraftServer.currentTickLong; // Paper - track current tick as a long
 -                if ( tickCount++ % MinecraftServer.SAMPLE_INTERVAL == 0 )
 -                {
 -                    long curTime = Util.getMillis();
@@ -135,7 +135,7 @@ index d76dae9ce9022308b316080ac48b7030d674cc6b..e9d56d75b7c648f04d3a56942b286609
                  // Spigot end
  
                  boolean flag = i == 0L;
-@@ -1075,7 +1137,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1073,7 +1135,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      this.debugCommandProfiler = new MinecraftServer.TimeProfiler(Util.getNanos(), this.tickCount);
                  }
  
diff --git a/patches/server/0033-Expose-server-build-information.patch b/patches/server/0033-Expose-server-build-information.patch
index 978c66d922..41cd49383c 100644
--- a/patches/server/0033-Expose-server-build-information.patch
+++ b/patches/server/0033-Expose-server-build-information.patch
@@ -533,7 +533,7 @@ index 0000000000000000000000000000000000000000..790bad0494454ca12ee152e3de6da3da
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e9d56d75b7c648f04d3a56942b2866090c570129..57ec168bac3727feb734e28cebc680328c1c4aec 100644
+index 46e03617bb32e4037d700c1b3698d397bd75de5c..2f57739431eb695149019724e2923f0d02e88d07 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -43,7 +43,6 @@ import java.util.Set;
@@ -553,7 +553,7 @@ index e9d56d75b7c648f04d3a56942b2866090c570129..57ec168bac3727feb734e28cebc68032
  import org.bukkit.event.server.ServerLoadEvent;
  // CraftBukkit end
  
-@@ -1702,7 +1699,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1700,7 +1697,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
@@ -590,7 +590,7 @@ index f077b8ff0bf0d96628db3569132696b68fd79921..5f11f5b16766f9d1d5640ae037e259be
              value.append("\n   Plugins: {");
              for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index acab477a4a026799319054c2eb4d0f2c99ab3d83..2a36e562967ec6174efe456e489c50ca10ba47e5 100644
+index 7d6d817f951811aad0f2ccea567e558bad1242fa..19d2b38cd4397cb53fc2ed3f0e5df5c66223fd5f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -11,8 +11,6 @@ import com.google.common.collect.MapMaker;
@@ -692,7 +692,7 @@ index 8da38624b5867ce88bdb3036e1ed6d99fc626f31..2097be352dc585b805dc73194cec0956
                  t.printStackTrace();
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 9576cabff99d154ef77595b074082adf9212698d..e091356ee1fa3ec09839de6ef5c450824ea40844 100644
+index 9383bf47404fca8d008d5c401ed37ddaa7bef4f7..d08b01fef9928f2239c8663cf90219dc7acad58c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -453,6 +453,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0043-Optimize-explosions.patch b/patches/server/0043-Optimize-explosions.patch
index 12aee5666a..7aea454fd3 100644
--- a/patches/server/0043-Optimize-explosions.patch
+++ b/patches/server/0043-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 57ec168bac3727feb734e28cebc680328c1c4aec..4f1204661e345462c08cc66e3a8851033f186268 100644
+index 2f57739431eb695149019724e2923f0d02e88d07..1ba2b1aaf0936963aca73a43632f978c95bf95e6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1573,6 +1573,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1571,6 +1571,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 ed44e0fd8c..8730c44f6b 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 4f1204661e345462c08cc66e3a8851033f186268..a37f11633663e07652274707b29a849e518511c5 100644
+index 1ba2b1aaf0936963aca73a43632f978c95bf95e6..639dd562b7eda25004ea10d6c481173afb214773 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1544,6 +1544,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1542,6 +1542,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
@@ -30,7 +30,7 @@ index de1708e5d39561115d2825eea4a5f6e1f1f4e5b8..1e5b42fc3903b14537d232c8adbbaf79
      public LevelChunk getChunkIfLoaded(int x, int z) {
          return this.chunkSource.getChunk(x, z, false);
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index eae1d6eedeed09b3f49913c2bb205b80442bbfe3..622ecc1aeb9140d5c0d181fa472d123c42e5c5f4 100644
+index dfb349ed8a0fb981b3234baf040bd3297a555ebf..024da1029baecae639d7c05b5f7c30dbaa67b006 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -491,7 +491,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
diff --git a/patches/server/0088-Configurable-Player-Collision.patch b/patches/server/0088-Configurable-Player-Collision.patch
index 81cdbc69c4..d8b666b4b6 100644
--- a/patches/server/0088-Configurable-Player-Collision.patch
+++ b/patches/server/0088-Configurable-Player-Collision.patch
@@ -18,10 +18,10 @@ index 9a1a961eabd4362c171da78c6be82c867f3696a4..1d0c473442b5c72245c356054440323e
              ComponentSerialization.TRUSTED_STREAM_CODEC.encode(buf, this.playerPrefix);
              ComponentSerialization.TRUSTED_STREAM_CODEC.encode(buf, this.playerSuffix);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a37f11633663e07652274707b29a849e518511c5..6dec7884fdd15eb8f32e8831ed0f3a92af710472 100644
+index 639dd562b7eda25004ea10d6c481173afb214773..30fbbe053ee325f4b9f7722416fb5fb92121e2ad 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -640,6 +640,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -639,6 +639,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 e16888eaab..4717574707 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 6dec7884fdd15eb8f32e8831ed0f3a92af710472..d8f2fe077e35fd6c70e0ba50945006819f50586f 100644
+index 30fbbe053ee325f4b9f7722416fb5fb92121e2ad..f16ade2019e58a9374a550f58113313c118c2f2b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -197,6 +197,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
@@ -17,7 +17,7 @@ index 6dec7884fdd15eb8f32e8831ed0f3a92af710472..d8f2fe077e35fd6c70e0ba5094500681
      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";
-@@ -331,6 +332,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -330,6 +331,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 6dec7884fdd15eb8f32e8831ed0f3a92af710472..d8f2fe077e35fd6c70e0ba5094500681
          this.metricsRecorder = InactiveMetricsRecorder.INSTANCE;
          this.profiler = this.metricsRecorder.getProfiler();
          this.onMetricsRecordingStopped = (methodprofilerresults) -> {
-@@ -2548,9 +2550,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2546,9 +2548,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return false;
      }
  
diff --git a/patches/server/0097-Async-GameProfileCache-saving.patch b/patches/server/0097-Async-GameProfileCache-saving.patch
index b352f836bd..b236872193 100644
--- a/patches/server/0097-Async-GameProfileCache-saving.patch
+++ b/patches/server/0097-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 d8f2fe077e35fd6c70e0ba50945006819f50586f..d566d64c6c3bd97ac4b4f80bdf1b1bd5a381ef55 100644
+index f16ade2019e58a9374a550f58113313c118c2f2b..10d69b48158460e5739d1e41a83fcaeec819fac6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -999,7 +999,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -998,7 +998,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");
diff --git a/patches/server/0128-Properly-handle-async-calls-to-restart-the-server.patch b/patches/server/0128-Properly-handle-async-calls-to-restart-the-server.patch
index 602cf5d4bb..f9160abe00 100644
--- a/patches/server/0128-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/patches/server/0128-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 d566d64c6c3bd97ac4b4f80bdf1b1bd5a381ef55..e464349a46eab23eb5b8d4d31f577d78532b3ce1 100644
+index 10d69b48158460e5739d1e41a83fcaeec819fac6..5d03477919ce892f6dfb4b2304c03733e10e3721 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -242,6 +242,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -41,7 +41,7 @@ index d566d64c6c3bd97ac4b4f80bdf1b1bd5a381ef55..e464349a46eab23eb5b8d4d31f577d78
      private boolean stopped;
      private int tickCount;
      private int ticksUntilAutosave;
-@@ -938,7 +939,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -937,7 +938,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 d566d64c6c3bd97ac4b4f80bdf1b1bd5a381ef55..e464349a46eab23eb5b8d4d31f577d78
              try { Thread.sleep(100); } catch (InterruptedException ex) {} // CraftBukkit - SPIGOT-625 - give server at least a chance to send packets
          }
  
-@@ -1018,6 +1019,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1017,6 +1018,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public void halt(boolean waitForShutdown) {
diff --git a/patches/server/0174-Implement-extended-PaperServerListPingEvent.patch b/patches/server/0174-Implement-extended-PaperServerListPingEvent.patch
index f7db224cb6..79d1bf0a28 100644
--- a/patches/server/0174-Implement-extended-PaperServerListPingEvent.patch
+++ b/patches/server/0174-Implement-extended-PaperServerListPingEvent.patch
@@ -170,7 +170,7 @@ index 0000000000000000000000000000000000000000..30a19d10869f73d67b794e8e4c035bc5
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e464349a46eab23eb5b8d4d31f577d78532b3ce1..7f4c9ba88c2d33c2cc23e406a616f9eb35d738ce 100644
+index 5d03477919ce892f6dfb4b2304c03733e10e3721..cc0968182ab597892dbae8dd9b3e803fb62b7065 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;
@@ -183,7 +183,7 @@ index e464349a46eab23eb5b8d4d31f577d78532b3ce1..7f4c9ba88c2d33c2cc23e406a616f9eb
  import com.google.common.collect.Lists;
  import com.google.common.collect.Maps;
  import com.google.common.collect.Sets;
-@@ -1517,7 +1520,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1515,7 +1518,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/0226-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0226-Add-Early-Warning-Feature-to-WatchDog.patch
index 6843b0c3c4..3f5acbe5d8 100644
--- a/patches/server/0226-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/server/0226-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 7f4c9ba88c2d33c2cc23e406a616f9eb35d738ce..5d429b707383e6620a0d83f23d7a8694ecc70735 100644
+index cc0968182ab597892dbae8dd9b3e803fb62b7065..2d5ae71c143556a938f078d2fb84cab7bd4f789b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1108,6 +1108,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1107,6 +1107,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.status = this.buildServerStatus();
  
              // Spigot start
@@ -33,7 +33,7 @@ index c466ec011d059b9960606ef2ee51ea3a3a65f8d0..baf93b5d5883d0a5c360f1a475949804
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2fa82336da744b6617e55c7d8303f6d769ccefef..a4e969a82eabc5ffdb776d1574f5b003fc19b177 100644
+index 5478c159843a74ea90b2b1c4d5eb3c92a910a857..ffe53ca530da2b2a1b28c7ee59a7f5599949a0a1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -962,6 +962,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0261-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/server/0261-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
index 278b5c5f14..588ca7240f 100644
--- a/patches/server/0261-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
+++ b/patches/server/0261-Improve-Server-Thread-Pool-and-Thread-Priorities.patch
@@ -92,10 +92,10 @@ index 54562fa04d14a937451ea7aa9d80194f2c31b471..4cf88f6d815d60cfbf8e4ecf9d96d0cf
          return executorService;
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5d429b707383e6620a0d83f23d7a8694ecc70735..995ee6b2af01a14d61a031008dd05518668a98ae 100644
+index 2d5ae71c143556a938f078d2fb84cab7bd4f789b..f3f3f80f14bc1df13b80033aa143fcccab6f3a31 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -323,6 +323,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -322,6 +322,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/0262-Optimize-World-Time-Updates.patch b/patches/server/0262-Optimize-World-Time-Updates.patch
index 1ce97af599..ab47d03d57 100644
--- a/patches/server/0262-Optimize-World-Time-Updates.patch
+++ b/patches/server/0262-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 995ee6b2af01a14d61a031008dd05518668a98ae..0b266d3855723752d7789340f5d98ea106a97722 100644
+index f3f3f80f14bc1df13b80033aa143fcccab6f3a31..699191356a9d873fa6bbe04ea3e5db91eb2db41d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1562,12 +1562,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1560,12 +1560,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/0275-Async-command-map-building.patch b/patches/server/0275-Async-command-map-building.patch
index 4a9cc54166..b202de9d24 100644
--- a/patches/server/0275-Async-command-map-building.patch
+++ b/patches/server/0275-Async-command-map-building.patch
@@ -53,10 +53,10 @@ index 72756ef14b8ec8afd80313b9f6aaf76722cb18cf..a05aea8561ac102476ee1b3068942b09
          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 0b266d3855723752d7789340f5d98ea106a97722..bd882ebb8e24de671518bf6b12f9ee4bc3f35128 100644
+index 699191356a9d873fa6bbe04ea3e5db91eb2db41d..8ecfd7a3daa99dabe796d28d27790fb8b45c628b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -931,6 +931,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -930,6 +930,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
  
          MinecraftServer.LOGGER.info("Stopping server");
diff --git a/patches/server/0284-Server-Tick-Events.patch b/patches/server/0283-Server-Tick-Events.patch
index afbd125410..5c5d419332 100644
--- a/patches/server/0284-Server-Tick-Events.patch
+++ b/patches/server/0283-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 bd882ebb8e24de671518bf6b12f9ee4bc3f35128..3ffb330a16797c04694f73b0cd9f5b38a07641b4 100644
+index 8ecfd7a3daa99dabe796d28d27790fb8b45c628b..ddc3da84c5a55d2cd977fcdb18121351606a6b3c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1435,6 +1435,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1433,6 +1433,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          });
          isOversleep = false;MinecraftTimings.serverOversleep.stopTiming();
          // Paper end
@@ -17,7 +17,7 @@ index bd882ebb8e24de671518bf6b12f9ee4bc3f35128..3ffb330a16797c04694f73b0cd9f5b38
  
          ++this.tickCount;
          this.tickRateManager.tick();
-@@ -1460,6 +1461,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1458,6 +1459,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.runAllTasks();
          }
          // Paper end
diff --git a/patches/server/0283-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/server/0283-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
deleted file mode 100644
index f6592c8703..0000000000
--- a/patches/server/0283-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <[email protected]>
-Date: Sun, 24 Mar 2019 18:09:20 -0400
-Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items
-
-vanilla checks for == 0
-
-diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index f9dfd6e7b610cfee75524a525ab0e72bed5522da..6dfa43036afeba75a7ecc5a82637f081624d5c69 100644
---- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -149,6 +149,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
-             // CraftBukkit start - Use wall time for pickup and despawn timers
-             int elapsedTicks = MinecraftServer.currentTick - this.lastTick;
-             if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks;
-+            this.pickupDelay = Math.max(0, this.pickupDelay); // Paper - don't go below 0
-             if (this.age != -32768) this.age += elapsedTicks;
-             this.lastTick = MinecraftServer.currentTick;
-             // CraftBukkit end
-@@ -234,6 +235,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
-         // CraftBukkit start - Use wall time for pickup and despawn timers
-         int elapsedTicks = MinecraftServer.currentTick - this.lastTick;
-         if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks;
-+        this.pickupDelay = Math.max(0, this.pickupDelay); // Paper - don't go below 0
-         if (this.age != -32768) this.age += elapsedTicks;
-         this.lastTick = MinecraftServer.currentTick;
-         // CraftBukkit end
diff --git a/patches/server/0285-PlayerDeathEvent-getItemsToKeep.patch b/patches/server/0284-PlayerDeathEvent-getItemsToKeep.patch
index 4284b5ff3b..4284b5ff3b 100644
--- a/patches/server/0285-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/server/0284-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/server/0286-Optimize-Captured-BlockEntity-Lookup.patch b/patches/server/0285-Optimize-Captured-BlockEntity-Lookup.patch
index 0cbe385bec..0cbe385bec 100644
--- a/patches/server/0286-Optimize-Captured-BlockEntity-Lookup.patch
+++ b/patches/server/0285-Optimize-Captured-BlockEntity-Lookup.patch
diff --git a/patches/server/0287-Mob-Spawner-API-Enhancements.patch b/patches/server/0286-Mob-Spawner-API-Enhancements.patch
index 9f35b91c5a..9f35b91c5a 100644
--- a/patches/server/0287-Mob-Spawner-API-Enhancements.patch
+++ b/patches/server/0286-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/server/0288-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/server/0287-Fix-CB-call-to-changed-postToMainThread-method.patch
index b135e59221..b135e59221 100644
--- a/patches/server/0288-Fix-CB-call-to-changed-postToMainThread-method.patch
+++ b/patches/server/0287-Fix-CB-call-to-changed-postToMainThread-method.patch
diff --git a/patches/server/0289-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/server/0288-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
index 83a7d7d541..83a7d7d541 100644
--- a/patches/server/0289-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
+++ b/patches/server/0288-Fix-sounds-when-item-frames-are-modified-MC-123450.patch
diff --git a/patches/server/0290-Implement-CraftBlockSoundGroup.patch b/patches/server/0289-Implement-CraftBlockSoundGroup.patch
index 9bf16806b3..9bf16806b3 100644
--- a/patches/server/0290-Implement-CraftBlockSoundGroup.patch
+++ b/patches/server/0289-Implement-CraftBlockSoundGroup.patch
diff --git a/patches/server/0291-Expose-the-internal-current-tick.patch b/patches/server/0290-Expose-the-internal-current-tick.patch
index 1cedc35404..1cedc35404 100644
--- a/patches/server/0291-Expose-the-internal-current-tick.patch
+++ b/patches/server/0290-Expose-the-internal-current-tick.patch
diff --git a/patches/server/0292-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/server/0291-Show-blockstate-location-if-we-failed-to-read-it.patch
index 35f4f6c443..c12cf5a95d 100644
--- a/patches/server/0292-Show-blockstate-location-if-we-failed-to-read-it.patch
+++ b/patches/server/0291-Show-blockstate-location-if-we-failed-to-read-it.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Show blockstate location if we failed to read it
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index a7bb7d263cb981fcf6dd35a3b32270e89e96945a..92133f16c192f5caf9962a08401ff914550747f8 100644
+index 1ca25dfdb9ec5c3a4d26b71484e1326e1f50b40d..302955eed07d3af91f90875583c70a236bbe11b2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -32,6 +32,7 @@ public class CraftBlockEntityState<T extends BlockEntity> extends CraftBlockStat
diff --git a/patches/server/0293-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/server/0292-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
index cb2e502f71..cb2e502f71 100644
--- a/patches/server/0293-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
+++ b/patches/server/0292-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch
diff --git a/patches/server/0294-Configurable-projectile-relative-velocity.patch b/patches/server/0293-Configurable-projectile-relative-velocity.patch
index 29613c9f00..29613c9f00 100644
--- a/patches/server/0294-Configurable-projectile-relative-velocity.patch
+++ b/patches/server/0293-Configurable-projectile-relative-velocity.patch
diff --git a/patches/server/0295-offset-item-frame-ticking.patch b/patches/server/0294-offset-item-frame-ticking.patch
index 3db1ffe305..3db1ffe305 100644
--- a/patches/server/0295-offset-item-frame-ticking.patch
+++ b/patches/server/0294-offset-item-frame-ticking.patch
diff --git a/patches/server/0296-Prevent-consuming-the-wrong-itemstack.patch b/patches/server/0295-Prevent-consuming-the-wrong-itemstack.patch
index c0dbff9a6b..c0dbff9a6b 100644
--- a/patches/server/0296-Prevent-consuming-the-wrong-itemstack.patch
+++ b/patches/server/0295-Prevent-consuming-the-wrong-itemstack.patch
diff --git a/patches/server/0297-Dont-send-unnecessary-sign-update.patch b/patches/server/0296-Dont-send-unnecessary-sign-update.patch
index afca8562db..afca8562db 100644
--- a/patches/server/0297-Dont-send-unnecessary-sign-update.patch
+++ b/patches/server/0296-Dont-send-unnecessary-sign-update.patch
diff --git a/patches/server/0298-Add-option-to-disable-pillager-patrols.patch b/patches/server/0297-Add-option-to-disable-pillager-patrols.patch
index 3021a1f6c8..3021a1f6c8 100644
--- a/patches/server/0298-Add-option-to-disable-pillager-patrols.patch
+++ b/patches/server/0297-Add-option-to-disable-pillager-patrols.patch
diff --git a/patches/server/0299-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/server/0298-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
index 82277a287f..82277a287f 100644
--- a/patches/server/0299-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
+++ b/patches/server/0298-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch
diff --git a/patches/server/0300-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/server/0299-MC-145656-Fix-Follow-Range-Initial-Target.patch
index 528cf153ea..528cf153ea 100644
--- a/patches/server/0300-MC-145656-Fix-Follow-Range-Initial-Target.patch
+++ b/patches/server/0299-MC-145656-Fix-Follow-Range-Initial-Target.patch
diff --git a/patches/server/0301-Duplicate-UUID-Resolve-Option.patch b/patches/server/0300-Duplicate-UUID-Resolve-Option.patch
index 0139752e8e..0139752e8e 100644
--- a/patches/server/0301-Duplicate-UUID-Resolve-Option.patch
+++ b/patches/server/0300-Duplicate-UUID-Resolve-Option.patch
diff --git a/patches/server/0302-PlayerDeathEvent-shouldDropExperience.patch b/patches/server/0301-PlayerDeathEvent-shouldDropExperience.patch
index b48dcea61d..b48dcea61d 100644
--- a/patches/server/0302-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/server/0301-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/server/0303-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/server/0302-Prevent-bees-loading-chunks-checking-hive-position.patch
index e933516d42..e933516d42 100644
--- a/patches/server/0303-Prevent-bees-loading-chunks-checking-hive-position.patch
+++ b/patches/server/0302-Prevent-bees-loading-chunks-checking-hive-position.patch
diff --git a/patches/server/0304-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/server/0303-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
index 3b189be4e4..3b189be4e4 100644
--- a/patches/server/0304-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/patches/server/0303-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
diff --git a/patches/server/0305-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/server/0304-Optimise-EntityGetter-getPlayerByUUID.patch
index 6ffcd9f3c3..6ffcd9f3c3 100644
--- a/patches/server/0305-Optimise-EntityGetter-getPlayerByUUID.patch
+++ b/patches/server/0304-Optimise-EntityGetter-getPlayerByUUID.patch
diff --git a/patches/server/0306-Fix-items-not-falling-correctly.patch b/patches/server/0305-Fix-items-not-falling-correctly.patch
index aaff528185..5be02c3b7b 100644
--- a/patches/server/0306-Fix-items-not-falling-correctly.patch
+++ b/patches/server/0305-Fix-items-not-falling-correctly.patch
@@ -15,10 +15,10 @@ This patch resolves the conflict by offsetting checking Spigot's entity
 activation range check from an item's move method.
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 6dfa43036afeba75a7ecc5a82637f081624d5c69..8351e46f667a8f8dd96d97ec15c0165261a2fab4 100644
+index f9dfd6e7b610cfee75524a525ab0e72bed5522da..e110296a95441a13ec431d897796326b0277edb1 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -176,7 +176,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -175,7 +175,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
                  }
              }
  
diff --git a/patches/server/0307-Optimize-call-to-getFluid-for-explosions.patch b/patches/server/0306-Optimize-call-to-getFluid-for-explosions.patch
index 4cd45e61ca..4cd45e61ca 100644
--- a/patches/server/0307-Optimize-call-to-getFluid-for-explosions.patch
+++ b/patches/server/0306-Optimize-call-to-getFluid-for-explosions.patch
diff --git a/patches/server/0308-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/server/0307-Guard-against-serializing-mismatching-chunk-coordina.patch
index 6752b44617..6752b44617 100644
--- a/patches/server/0308-Guard-against-serializing-mismatching-chunk-coordina.patch
+++ b/patches/server/0307-Guard-against-serializing-mismatching-chunk-coordina.patch
diff --git a/patches/server/0309-Alternative-item-despawn-rate.patch b/patches/server/0308-Alternative-item-despawn-rate.patch
index 5f9a648f99..d4e1a80c7c 100644
--- a/patches/server/0309-Alternative-item-despawn-rate.patch
+++ b/patches/server/0308-Alternative-item-despawn-rate.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Alternative item-despawn-rate
 Co-authored-by: Noah van der Aa <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 8351e46f667a8f8dd96d97ec15c0165261a2fab4..2e550c7db6cebc941590c35337fd47416407a5aa 100644
+index e110296a95441a13ec431d897796326b0277edb1..c724359995d65c88e7f365eea55f3e4382a46ddd 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -62,6 +62,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
@@ -17,7 +17,7 @@ index 8351e46f667a8f8dd96d97ec15c0165261a2fab4..2e550c7db6cebc941590c35337fd4741
  
      public ItemEntity(EntityType<? extends ItemEntity> type, Level world) {
          super(type, world);
-@@ -216,7 +217,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -215,7 +216,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
                  }
              }
  
@@ -26,7 +26,7 @@ index 8351e46f667a8f8dd96d97ec15c0165261a2fab4..2e550c7db6cebc941590c35337fd4741
                  // CraftBukkit start - fire ItemDespawnEvent
                  if (CraftEventFactory.callItemDespawnEvent(this).isCancelled()) {
                      this.age = 0;
-@@ -240,7 +241,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -238,7 +239,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
          this.lastTick = MinecraftServer.currentTick;
          // CraftBukkit end
  
@@ -35,7 +35,7 @@ index 8351e46f667a8f8dd96d97ec15c0165261a2fab4..2e550c7db6cebc941590c35337fd4741
              // CraftBukkit start - fire ItemDespawnEvent
              if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemDespawnEvent(this).isCancelled()) {
                  this.age = 0;
-@@ -296,7 +297,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -294,7 +295,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
      private boolean isMergable() {
          ItemStack itemstack = this.getItem();
  
@@ -44,7 +44,7 @@ index 8351e46f667a8f8dd96d97ec15c0165261a2fab4..2e550c7db6cebc941590c35337fd4741
      }
  
      private void tryToMerge(ItemEntity other) {
-@@ -544,6 +545,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -542,6 +543,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
  
      public void setItem(ItemStack stack) {
          this.getEntityData().set(ItemEntity.DATA_ITEM, stack);
@@ -52,7 +52,7 @@ index 8351e46f667a8f8dd96d97ec15c0165261a2fab4..2e550c7db6cebc941590c35337fd4741
      }
  
      @Override
-@@ -598,7 +600,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -596,7 +598,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
  
      public void makeFakeItem() {
          this.setNeverPickUp();
diff --git a/patches/server/0310-Tracking-Range-Improvements.patch b/patches/server/0309-Tracking-Range-Improvements.patch
index 845b77df2e..845b77df2e 100644
--- a/patches/server/0310-Tracking-Range-Improvements.patch
+++ b/patches/server/0309-Tracking-Range-Improvements.patch
diff --git a/patches/server/0311-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/server/0310-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
index 9ea731b674..9ea731b674 100644
--- a/patches/server/0311-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
+++ b/patches/server/0310-Bees-get-gravity-in-void.-Fixes-MC-167279.patch
diff --git a/patches/server/0312-Improve-Block-breakNaturally-API.patch b/patches/server/0311-Improve-Block-breakNaturally-API.patch
index b478ee5bb4..b478ee5bb4 100644
--- a/patches/server/0312-Improve-Block-breakNaturally-API.patch
+++ b/patches/server/0311-Improve-Block-breakNaturally-API.patch
diff --git a/patches/server/0313-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/server/0312-Optimise-getChunkAt-calls-for-loaded-chunks.patch
index d1fed5285f..d1fed5285f 100644
--- a/patches/server/0313-Optimise-getChunkAt-calls-for-loaded-chunks.patch
+++ b/patches/server/0312-Optimise-getChunkAt-calls-for-loaded-chunks.patch
diff --git a/patches/server/0314-Add-debug-for-sync-chunk-loads.patch b/patches/server/0313-Add-debug-for-sync-chunk-loads.patch
index bf5532d58e..bf5532d58e 100644
--- a/patches/server/0314-Add-debug-for-sync-chunk-loads.patch
+++ b/patches/server/0313-Add-debug-for-sync-chunk-loads.patch
diff --git a/patches/server/0315-Improve-java-version-check.patch b/patches/server/0314-Improve-java-version-check.patch
index 3d9eed5372..3d9eed5372 100644
--- a/patches/server/0315-Improve-java-version-check.patch
+++ b/patches/server/0314-Improve-java-version-check.patch
diff --git a/patches/server/0316-Add-ThrownEggHatchEvent.patch b/patches/server/0315-Add-ThrownEggHatchEvent.patch
index 21fd12f380..21fd12f380 100644
--- a/patches/server/0316-Add-ThrownEggHatchEvent.patch
+++ b/patches/server/0315-Add-ThrownEggHatchEvent.patch
diff --git a/patches/server/0317-Entity-Jump-API.patch b/patches/server/0316-Entity-Jump-API.patch
index 1c521e9d99..1c521e9d99 100644
--- a/patches/server/0317-Entity-Jump-API.patch
+++ b/patches/server/0316-Entity-Jump-API.patch
diff --git a/patches/server/0318-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0317-Add-option-to-nerf-pigmen-from-nether-portals.patch
index 18fff797e7..18fff797e7 100644
--- a/patches/server/0318-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/server/0317-Add-option-to-nerf-pigmen-from-nether-portals.patch
diff --git a/patches/server/0319-Make-the-GUI-graph-fancier.patch b/patches/server/0318-Make-the-GUI-graph-fancier.patch
index 9e79ca7b91..9e79ca7b91 100644
--- a/patches/server/0319-Make-the-GUI-graph-fancier.patch
+++ b/patches/server/0318-Make-the-GUI-graph-fancier.patch
diff --git a/patches/server/0320-add-hand-to-BlockMultiPlaceEvent.patch b/patches/server/0319-add-hand-to-BlockMultiPlaceEvent.patch
index 56eb680f94..078a0ba255 100644
--- a/patches/server/0320-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/server/0319-add-hand-to-BlockMultiPlaceEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add hand to BlockMultiPlaceEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 6a018f9c289a539b07855d75e4cc2d3c2828ded1..e25ca301a4b9b252d3f75013e4e14df9b14aa7b9 100644
+index 8172a75aef7c3dcdd92817f148466a4cad4c78ed..235ac5c12dab593da3a40e348a010ff626ce74a3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -412,13 +412,18 @@ public class CraftEventFactory {
diff --git a/patches/server/0321-Validate-tripwire-hook-placement-before-update.patch b/patches/server/0320-Validate-tripwire-hook-placement-before-update.patch
index bc1125b169..bc1125b169 100644
--- a/patches/server/0321-Validate-tripwire-hook-placement-before-update.patch
+++ b/patches/server/0320-Validate-tripwire-hook-placement-before-update.patch
diff --git a/patches/server/0322-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/server/0321-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
index 75d1d9c02b..75d1d9c02b 100644
--- a/patches/server/0322-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
+++ b/patches/server/0321-Add-option-to-allow-iron-golems-to-spawn-in-air.patch
diff --git a/patches/server/0323-Configurable-chance-of-villager-zombie-infection.patch b/patches/server/0322-Configurable-chance-of-villager-zombie-infection.patch
index 217787cdc9..217787cdc9 100644
--- a/patches/server/0323-Configurable-chance-of-villager-zombie-infection.patch
+++ b/patches/server/0322-Configurable-chance-of-villager-zombie-infection.patch
diff --git a/patches/server/0324-Optimise-Chunk-getFluid.patch b/patches/server/0323-Optimise-Chunk-getFluid.patch
index 8142952ce6..8142952ce6 100644
--- a/patches/server/0324-Optimise-Chunk-getFluid.patch
+++ b/patches/server/0323-Optimise-Chunk-getFluid.patch
diff --git a/patches/server/0325-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/server/0324-Set-spigots-verbose-world-setting-to-false-by-def.patch
index d6e5084490..d6e5084490 100644
--- a/patches/server/0325-Set-spigots-verbose-world-setting-to-false-by-def.patch
+++ b/patches/server/0324-Set-spigots-verbose-world-setting-to-false-by-def.patch
diff --git a/patches/server/0326-Add-tick-times-API-and-mspt-command.patch b/patches/server/0325-Add-tick-times-API-and-mspt-command.patch
index e1bd6dcc6c..ab7f366958 100644
--- a/patches/server/0326-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0325-Add-tick-times-API-and-mspt-command.patch
@@ -125,7 +125,7 @@ index 72f2e81b9905a0d57ed8e2a88578f62d5235c456..7b58b2d6297800c2dcdbf7539e5ab8e7
  
      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 3ffb330a16797c04694f73b0cd9f5b38a07641b4..ff73167bfe210305491e35f18adc2755d3651a85 100644
+index ddc3da84c5a55d2cd977fcdb18121351606a6b3c..53bb62c1dcb487be915759d22e06aea80be54f36 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -258,6 +258,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -140,7 +140,7 @@ index 3ffb330a16797c04694f73b0cd9f5b38a07641b4..ff73167bfe210305491e35f18adc2755
      @Nullable
      private KeyPair keyPair;
      @Nullable
-@@ -1474,6 +1479,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1472,6 +1477,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.aggregatedTickTimesNanos += j;
          this.tickTimesNanos[k] = j;
          this.smoothedTickTimeMillis = this.smoothedTickTimeMillis * 0.8F + (float) j / (float) TimeUtil.NANOSECONDS_PER_MILLISECOND * 0.19999999F;
@@ -152,7 +152,7 @@ index 3ffb330a16797c04694f73b0cd9f5b38a07641b4..ff73167bfe210305491e35f18adc2755
          this.logTickMethodTime(i);
          this.profiler.pop();
          org.spigotmc.WatchdogThread.tick(); // Spigot
-@@ -2857,4 +2867,30 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2855,4 +2865,30 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public static record ServerResourcePackInfo(UUID id, String url, String hash, boolean isRequired, @Nullable Component prompt) {
  
      }
diff --git a/patches/server/0327-Expose-MinecraftServer-isRunning.patch b/patches/server/0326-Expose-MinecraftServer-isRunning.patch
index 38e7506126..38e7506126 100644
--- a/patches/server/0327-Expose-MinecraftServer-isRunning.patch
+++ b/patches/server/0326-Expose-MinecraftServer-isRunning.patch
diff --git a/patches/server/0328-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/server/0327-Add-Raw-Byte-ItemStack-Serialization.patch
index fe8bfe79ba..fe8bfe79ba 100644
--- a/patches/server/0328-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/server/0327-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/server/0329-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/server/0328-Pillager-patrol-spawn-settings-and-per-player-option.patch
index d6517e07b1..d6517e07b1 100644
--- a/patches/server/0329-Pillager-patrol-spawn-settings-and-per-player-option.patch
+++ b/patches/server/0328-Pillager-patrol-spawn-settings-and-per-player-option.patch
diff --git a/patches/server/0330-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/server/0329-Remote-Connections-shouldn-t-hold-up-shutdown.patch
index fb2f7c6706..fb2f7c6706 100644
--- a/patches/server/0330-Remote-Connections-shouldn-t-hold-up-shutdown.patch
+++ b/patches/server/0329-Remote-Connections-shouldn-t-hold-up-shutdown.patch
diff --git a/patches/server/0331-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/server/0330-Do-not-allow-bees-to-load-chunks-for-beehives.patch
index f361af6e50..f361af6e50 100644
--- a/patches/server/0331-Do-not-allow-bees-to-load-chunks-for-beehives.patch
+++ b/patches/server/0330-Do-not-allow-bees-to-load-chunks-for-beehives.patch
diff --git a/patches/server/0332-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/server/0331-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
index 2ab532b2d0..2ab532b2d0 100644
--- a/patches/server/0332-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
+++ b/patches/server/0331-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch
diff --git a/patches/server/0333-Don-t-tick-dead-players.patch b/patches/server/0332-Don-t-tick-dead-players.patch
index 0633c8502c..0633c8502c 100644
--- a/patches/server/0333-Don-t-tick-dead-players.patch
+++ b/patches/server/0332-Don-t-tick-dead-players.patch
diff --git a/patches/server/0334-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/server/0333-Dead-Player-s-shouldn-t-be-able-to-move.patch
index d10a5a50c4..d10a5a50c4 100644
--- a/patches/server/0334-Dead-Player-s-shouldn-t-be-able-to-move.patch
+++ b/patches/server/0333-Dead-Player-s-shouldn-t-be-able-to-move.patch
diff --git a/patches/server/0335-Don-t-move-existing-players-to-world-spawn.patch b/patches/server/0334-Don-t-move-existing-players-to-world-spawn.patch
index 5b2b160a1f..4c59557ecb 100644
--- a/patches/server/0335-Don-t-move-existing-players-to-world-spawn.patch
+++ b/patches/server/0334-Don-t-move-existing-players-to-world-spawn.patch
@@ -35,7 +35,7 @@ index 47982f87ce93658c73ee3d7a5f7dd680e2f9aa36..f8d4bd18f98ed914e116d0cc4a80140e
          this.gameMode.setLevel((ServerLevel) world);
      }
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a2a913e20cdea9518da5ad0d1ef8908538860890..d29885aabcead3d410329ba3056a48bb29ff75cf 100644
+index 8cd80ea83ddcfd5052c8d8c19d3edb42538d1e15..2cbdcdf0349e7efa797802d0d339d158153690af 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -226,6 +226,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0336-Optimize-Pathfinding.patch b/patches/server/0335-Optimize-Pathfinding.patch
index 281988ce37..281988ce37 100644
--- a/patches/server/0336-Optimize-Pathfinding.patch
+++ b/patches/server/0335-Optimize-Pathfinding.patch
diff --git a/patches/server/0337-Reduce-Either-Optional-allocation.patch b/patches/server/0336-Reduce-Either-Optional-allocation.patch
index d42e0ac184..d42e0ac184 100644
--- a/patches/server/0337-Reduce-Either-Optional-allocation.patch
+++ b/patches/server/0336-Reduce-Either-Optional-allocation.patch
diff --git a/patches/server/0338-Reduce-memory-footprint-of-CompoundTag.patch b/patches/server/0337-Reduce-memory-footprint-of-CompoundTag.patch
index c29c346e90..c29c346e90 100644
--- a/patches/server/0338-Reduce-memory-footprint-of-CompoundTag.patch
+++ b/patches/server/0337-Reduce-memory-footprint-of-CompoundTag.patch
diff --git a/patches/server/0339-Prevent-opening-inventories-when-frozen.patch b/patches/server/0338-Prevent-opening-inventories-when-frozen.patch
index 3f6f9857e6..3f6f9857e6 100644
--- a/patches/server/0339-Prevent-opening-inventories-when-frozen.patch
+++ b/patches/server/0338-Prevent-opening-inventories-when-frozen.patch
diff --git a/patches/server/0340-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0339-Don-t-run-entity-collision-code-if-not-needed.patch
index 513fbebb15..4e134e507c 100644
--- a/patches/server/0340-Don-t-run-entity-collision-code-if-not-needed.patch
+++ b/patches/server/0339-Don-t-run-entity-collision-code-if-not-needed.patch
@@ -12,7 +12,7 @@ The entity's current team collision rule causes them to NEVER collide.
 Co-authored-by: Owen1212055 <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index bfa914857ff36d6c2f5f96a1ddbc4ca96c3ee7ac..855edf966c36e6ee9ec524e189b18d711baeec78 100644
+index 4c32b26e29ca3db0a2f62052e14bcc3e4c1cdea5..cf18f17f181bc94a2b5f4ac6926c2388ec3178c8 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3544,10 +3544,24 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0341-Implement-Player-Client-Options-API.patch b/patches/server/0340-Implement-Player-Client-Options-API.patch
index e7bff21f02..d190884bb0 100644
--- a/patches/server/0341-Implement-Player-Client-Options-API.patch
+++ b/patches/server/0340-Implement-Player-Client-Options-API.patch
@@ -136,7 +136,7 @@ index 7daa310dd5d3eb1befb9983ce85e0354771af71d..8938f90c53de8aef71aa70522a66a69e
          this.adventure$locale = java.util.Objects.requireNonNullElse(net.kyori.adventure.translation.Translator.parseLocale(this.language), java.util.Locale.US); // Paper
          this.requestedViewDistance = clientOptions.viewDistance();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d0af4b838bd43ef2388e918ac14e7acec71b63ef..b9487ce9391413c4c596cc5450ed5c396347ec1b 100644
+index 1959e2af13daa06293c10ea2a4f68e319fac26ad..068ff2c228308ec87fcc6d1352bd63b91bd34a93 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -653,6 +653,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0342-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0341-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
index 3e893aae8c..3e893aae8c 100644
--- a/patches/server/0342-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
+++ b/patches/server/0341-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff --git a/patches/server/0343-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch b/patches/server/0342-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
index 91acc7ee25..fda85df8ca 100644
--- a/patches/server/0343-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
+++ b/patches/server/0342-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch
@@ -55,7 +55,7 @@ index 8938f90c53de8aef71aa70522a66a69edb467e73..e6e7dc17d1196a8211a565355f34b5dc
      // CraftBukkit end
      public boolean isRealPlayer; // Paper
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index d29885aabcead3d410329ba3056a48bb29ff75cf..9da65c0d3e8398d018da28a8668481aaf9ded472 100644
+index 2cbdcdf0349e7efa797802d0d339d158153690af..5390ce62ec8afd24d2e028ea04d2ef3029a125f9 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -297,6 +297,12 @@ public abstract class PlayerList {
diff --git a/patches/server/0344-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/server/0343-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
index a75160c9e4..b739652ade 100644
--- a/patches/server/0344-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
+++ b/patches/server/0343-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
@@ -10,7 +10,7 @@ Co-authored-by: Wyatt Childers <[email protected]>
 Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 9da65c0d3e8398d018da28a8668481aaf9ded472..9044ed6cba10314c52c44a19be1fa88771c54be6 100644
+index 5390ce62ec8afd24d2e028ea04d2ef3029a125f9..6f587c4bb4704d93552ba61335d87b1852fc169c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -197,6 +197,7 @@ public abstract class PlayerList {
diff --git a/patches/server/0345-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0344-Add-PlayerAttackEntityCooldownResetEvent.patch
index 6958e0c01f..3348155d85 100644
--- a/patches/server/0345-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/server/0344-Add-PlayerAttackEntityCooldownResetEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 855edf966c36e6ee9ec524e189b18d711baeec78..926c8fd21bb610dc07658c41431a7795ba4f2870 100644
+index cf18f17f181bc94a2b5f4ac6926c2388ec3178c8..42c4adabe451cd32aa362075395a9fcc384ea788 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2277,7 +2277,17 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0346-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/server/0345-Don-t-fire-BlockFade-on-worldgen-threads.patch
index a909ceca12..a909ceca12 100644
--- a/patches/server/0346-Don-t-fire-BlockFade-on-worldgen-threads.patch
+++ b/patches/server/0345-Don-t-fire-BlockFade-on-worldgen-threads.patch
diff --git a/patches/server/0347-Add-phantom-creative-and-insomniac-controls.patch b/patches/server/0346-Add-phantom-creative-and-insomniac-controls.patch
index 9a012509be..0eea572994 100644
--- a/patches/server/0347-Add-phantom-creative-and-insomniac-controls.patch
+++ b/patches/server/0346-Add-phantom-creative-and-insomniac-controls.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add phantom creative and insomniac controls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntitySelector.java b/src/main/java/net/minecraft/world/entity/EntitySelector.java
-index 3207166061bf9c4d7bf3f38e5a9f7aff23ccd5c1..ee4495b67c46cf1282cdd6ad15b224b0b7b10bfb 100644
+index f7014bf5faae03a04c31cbdaeb27188c47156c2d..eb425fac573881f3aad09ae75a32184fb0e325a6 100644
 --- a/src/main/java/net/minecraft/world/entity/EntitySelector.java
 +++ b/src/main/java/net/minecraft/world/entity/EntitySelector.java
 @@ -28,6 +28,7 @@ public final class EntitySelector {
diff --git a/patches/server/0348-Fix-item-duplication-and-teleport-issues.patch b/patches/server/0347-Fix-item-duplication-and-teleport-issues.patch
index c577f08518..86f3c094a3 100644
--- a/patches/server/0348-Fix-item-duplication-and-teleport-issues.patch
+++ b/patches/server/0347-Fix-item-duplication-and-teleport-issues.patch
@@ -69,7 +69,7 @@ index d80fd4e2f41583f83c9527ccf4ce80afe851276a..10015beb7a2de890fe27bffde8f55c1d
  
      public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 926c8fd21bb610dc07658c41431a7795ba4f2870..c0bbeaa4a37c1ba9f5125a0c68f4511aac6a0e71 100644
+index 42c4adabe451cd32aa362075395a9fcc384ea788..8920099eb488c37b036b7bd97fbd4f7db505c77c 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1728,9 +1728,9 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -124,7 +124,7 @@ index 92bb0c63330ad3a4cb13b2dc655020714e9b1ffd..cc1189c2d7dc57ba8f29aad4ba5d2a07
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e25ca301a4b9b252d3f75013e4e14df9b14aa7b9..9548ee5b43458ccc865f800d1f1b69245a821658 100644
+index 235ac5c12dab593da3a40e348a010ff626ce74a3..26f8a8cb18205bfb9fe9dc557097946987ddcb18 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -905,6 +905,11 @@ public class CraftEventFactory {
diff --git a/patches/server/0349-Villager-Restocks-API.patch b/patches/server/0348-Villager-Restocks-API.patch
index 1f7c26de9d..1f7c26de9d 100644
--- a/patches/server/0349-Villager-Restocks-API.patch
+++ b/patches/server/0348-Villager-Restocks-API.patch
diff --git a/patches/server/0350-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/server/0349-Validate-PickItem-Packet-and-kick-for-invalid.patch
index 774f59a115..774f59a115 100644
--- a/patches/server/0350-Validate-PickItem-Packet-and-kick-for-invalid.patch
+++ b/patches/server/0349-Validate-PickItem-Packet-and-kick-for-invalid.patch
diff --git a/patches/server/0351-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/server/0350-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
index 46f51a9f45..46f51a9f45 100644
--- a/patches/server/0351-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
+++ b/patches/server/0350-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch
diff --git a/patches/server/0352-misc-debugging-dumps.patch b/patches/server/0351-misc-debugging-dumps.patch
index 51357a8884..ba40cf94e5 100644
--- a/patches/server/0352-misc-debugging-dumps.patch
+++ b/patches/server/0351-misc-debugging-dumps.patch
@@ -49,10 +49,10 @@ index e25fc35716aff1d1805884b18f67b0eb33d8c05c..8ca9ac8eff9d605baa878ca24e165ac5
                  StackTraceElement[] astacktraceelement = exception.getStackTrace();
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ff73167bfe210305491e35f18adc2755d3651a85..1088a91ee131d1c303961557d8fb90101c2d8d3b 100644
+index 53bb62c1dcb487be915759d22e06aea80be54f36..8b17df3d18fe9acc1a7b10c6809886da0143f8c5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -916,6 +916,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -915,6 +915,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      // CraftBukkit start
      private boolean hasStopped = false;
@@ -60,7 +60,7 @@ index ff73167bfe210305491e35f18adc2755d3651a85..1088a91ee131d1c303961557d8fb9010
      private final Object stopLock = new Object();
      public final boolean hasStopped() {
          synchronized (this.stopLock) {
-@@ -930,6 +931,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -929,6 +930,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              if (this.hasStopped) return;
              this.hasStopped = true;
          }
@@ -68,7 +68,7 @@ index ff73167bfe210305491e35f18adc2755d3651a85..1088a91ee131d1c303961557d8fb9010
          // CraftBukkit end
          if (this.metricsRecorder.isRecording()) {
              this.cancelRecordingMetrics();
-@@ -1034,6 +1036,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1033,6 +1035,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
      public void safeShutdown(boolean waitForShutdown, boolean isRestarting) {
          this.isRestarting = isRestarting;
@@ -105,7 +105,7 @@ index 5457358bc76889153036818fdfd70a043ec4e40f..880e5c52746e9e3a9a1f42ec6461be54
              this.connection.disconnect(ServerConfigurationPacketListenerImpl.DISCONNECT_REASON_INVALID_DATA);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7b0f0777dd20c5fd1813fabf8d34bc99659be9d2..9699d15f1194af7a565504cbae5aa9e3743665ec 100644
+index 01415a1523a783d8581e463dcea4f96ff8d0807e..6ea6e3280015a31a1679a874ca63c90be8252a86 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1047,6 +1047,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0353-Prevent-teleporting-dead-entities.patch b/patches/server/0352-Prevent-teleporting-dead-entities.patch
index 361f87db56..361f87db56 100644
--- a/patches/server/0353-Prevent-teleporting-dead-entities.patch
+++ b/patches/server/0352-Prevent-teleporting-dead-entities.patch
diff --git a/patches/server/0354-Implement-Mob-Goal-API.patch b/patches/server/0353-Implement-Mob-Goal-API.patch
index 9382352103..9382352103 100644
--- a/patches/server/0354-Implement-Mob-Goal-API.patch
+++ b/patches/server/0353-Implement-Mob-Goal-API.patch
diff --git a/patches/server/0355-Add-villager-reputation-API.patch b/patches/server/0354-Add-villager-reputation-API.patch
index cf69cd346a..cf69cd346a 100644
--- a/patches/server/0355-Add-villager-reputation-API.patch
+++ b/patches/server/0354-Add-villager-reputation-API.patch
diff --git a/patches/server/0356-ExperienceOrb-merging-stacking-API-and-fixes.patch b/patches/server/0355-ExperienceOrb-merging-stacking-API-and-fixes.patch
index 3ebf6e2165..369ade0720 100644
--- a/patches/server/0356-ExperienceOrb-merging-stacking-API-and-fixes.patch
+++ b/patches/server/0355-ExperienceOrb-merging-stacking-API-and-fixes.patch
@@ -77,7 +77,7 @@ index 5a7d314ec0562e472f5dc45924a7b24841cff126..650e4a01cecc4cc08e7ff9ebcc4c3670
      public java.util.UUID getTriggerEntityId() {
          return getHandle().triggerEntityId;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 9548ee5b43458ccc865f800d1f1b69245a821658..752aba27c3eb9815bdd2b4683483c70e891711e7 100644
+index 26f8a8cb18205bfb9fe9dc557097946987ddcb18..f3ec3d14e66b9c1dff32088d4aef57e21265048c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -714,15 +714,29 @@ public class CraftEventFactory {
diff --git a/patches/server/0357-Fix-PotionEffect-ignores-icon-flag.patch b/patches/server/0356-Fix-PotionEffect-ignores-icon-flag.patch
index 59845e22d4..db96543261 100644
--- a/patches/server/0357-Fix-PotionEffect-ignores-icon-flag.patch
+++ b/patches/server/0356-Fix-PotionEffect-ignores-icon-flag.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix PotionEffect ignores icon flag
 Co-authored-by: Tamion <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 94f2b0fa94ebc2572c33623fa5883dd7ed56c55a..9cf3e1e20799caf4ba469ef6d5d86bfe176641f7 100644
+index b6238c327e91a52b77135290762feb8b1085fc7e..b1c4970920ca8972f637c846106ae37822e495cf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -484,7 +484,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0358-Potential-bed-API.patch b/patches/server/0357-Potential-bed-API.patch
index 9b500674e0..899b989746 100644
--- a/patches/server/0358-Potential-bed-API.patch
+++ b/patches/server/0357-Potential-bed-API.patch
@@ -8,7 +8,7 @@ Adds a new method to fetch the location of a player's bed without generating any
 getPotentialBedLocation - Gets the last known location of a player's bed. This does not preform any check if the bed is still valid and does not load any chunks.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index b55919a0e61a36697c95599dba17dbe2b788fd2a..084938fa2ffa7ee462766bf03f8e2b4c0fd4bf6b 100644
+index ba63c58d40cb3b8655fdb8177c423c67ac7cc3ef..c17dd4205983855615289cf0a5619056d237f325 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -12,6 +12,7 @@ import net.minecraft.nbt.CompoundTag;
diff --git a/patches/server/0359-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0358-Wait-for-Async-Tasks-during-shutdown.patch
index 86d1266b2e..289e0129e9 100644
--- a/patches/server/0359-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0358-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 1088a91ee131d1c303961557d8fb90101c2d8d3b..2d25ba18d3db4b3eea8bd30812656f1ade4c2a67 100644
+index 8b17df3d18fe9acc1a7b10c6809886da0143f8c5..0370d26bd1e1d2fe1d640b052aca8a9c05dcb9dc 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -943,6 +943,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -942,6 +942,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // CraftBukkit start
          if (this.server != null) {
              this.server.disablePlugins();
@@ -22,7 +22,7 @@ index 1088a91ee131d1c303961557d8fb90101c2d8d3b..2d25ba18d3db4b3eea8bd30812656f1a
          // CraftBukkit end
          if (io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper != null) io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper.shutdown(); // Paper - Plugin remapping
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0b87d9c3fb7e2442798faacdd49d3fd368e64b7d..1b3f1b06155e114cd5ab76a406c1b4e745ef58c6 100644
+index 48c3d926682dd72ba476b4afc9e44e0113af0b46..610661dec58b9170d2eb2093c7fab81585ff9a2c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1058,6 +1058,32 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0360-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/server/0359-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
index dfe8e5260b..dfe8e5260b 100644
--- a/patches/server/0360-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
+++ b/patches/server/0359-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch
diff --git a/patches/server/0361-Add-option-for-console-having-all-permissions.patch b/patches/server/0360-Add-option-for-console-having-all-permissions.patch
index ace91d22dd..ace91d22dd 100644
--- a/patches/server/0361-Add-option-for-console-having-all-permissions.patch
+++ b/patches/server/0360-Add-option-for-console-having-all-permissions.patch
diff --git a/patches/server/0362-Fix-villager-trading-demand-MC-163962.patch b/patches/server/0361-Fix-villager-trading-demand-MC-163962.patch
index bd7b6c4273..bd7b6c4273 100644
--- a/patches/server/0362-Fix-villager-trading-demand-MC-163962.patch
+++ b/patches/server/0361-Fix-villager-trading-demand-MC-163962.patch
diff --git a/patches/server/0363-Maps-shouldn-t-load-chunks.patch b/patches/server/0362-Maps-shouldn-t-load-chunks.patch
index 3bc3299f81..3bc3299f81 100644
--- a/patches/server/0363-Maps-shouldn-t-load-chunks.patch
+++ b/patches/server/0362-Maps-shouldn-t-load-chunks.patch
diff --git a/patches/server/0364-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/server/0363-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
index 27672e59d7..27672e59d7 100644
--- a/patches/server/0364-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
+++ b/patches/server/0363-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch
diff --git a/patches/server/0365-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/server/0364-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
index f3c9792760..f3c9792760 100644
--- a/patches/server/0365-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
+++ b/patches/server/0364-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch
diff --git a/patches/server/0366-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/server/0365-Fix-piston-physics-inconsistency-MC-188840.patch
index 44f85960c4..44f85960c4 100644
--- a/patches/server/0366-Fix-piston-physics-inconsistency-MC-188840.patch
+++ b/patches/server/0365-Fix-piston-physics-inconsistency-MC-188840.patch
diff --git a/patches/server/0367-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0366-Fix-missing-chunks-due-to-integer-overflow.patch
index e7af97469b..e7af97469b 100644
--- a/patches/server/0367-Fix-missing-chunks-due-to-integer-overflow.patch
+++ b/patches/server/0366-Fix-missing-chunks-due-to-integer-overflow.patch
diff --git a/patches/server/0368-Prevent-position-desync-causing-tp-exploit.patch b/patches/server/0367-Prevent-position-desync-causing-tp-exploit.patch
index 0bd37ce94e..0bd37ce94e 100644
--- a/patches/server/0368-Prevent-position-desync-causing-tp-exploit.patch
+++ b/patches/server/0367-Prevent-position-desync-causing-tp-exploit.patch
diff --git a/patches/server/0369-Inventory-getHolder-method-without-block-snapshot.patch b/patches/server/0368-Inventory-getHolder-method-without-block-snapshot.patch
index b30d42bf56..b30d42bf56 100644
--- a/patches/server/0369-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/server/0368-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/server/0370-Add-PlayerRecipeBookClickEvent.patch b/patches/server/0369-Add-PlayerRecipeBookClickEvent.patch
index add0eaf3d4..add0eaf3d4 100644
--- a/patches/server/0370-Add-PlayerRecipeBookClickEvent.patch
+++ b/patches/server/0369-Add-PlayerRecipeBookClickEvent.patch
diff --git a/patches/server/0371-Hide-sync-chunk-writes-behind-flag.patch b/patches/server/0370-Hide-sync-chunk-writes-behind-flag.patch
index e8889b31d8..e8889b31d8 100644
--- a/patches/server/0371-Hide-sync-chunk-writes-behind-flag.patch
+++ b/patches/server/0370-Hide-sync-chunk-writes-behind-flag.patch
diff --git a/patches/server/0372-Add-permission-for-command-blocks.patch b/patches/server/0371-Add-permission-for-command-blocks.patch
index 84caef8385..84caef8385 100644
--- a/patches/server/0372-Add-permission-for-command-blocks.patch
+++ b/patches/server/0371-Add-permission-for-command-blocks.patch
diff --git a/patches/server/0373-Ensure-Entity-position-and-AABB-are-never-invalid.patch b/patches/server/0372-Ensure-Entity-position-and-AABB-are-never-invalid.patch
index 63a1e5a411..63a1e5a411 100644
--- a/patches/server/0373-Ensure-Entity-position-and-AABB-are-never-invalid.patch
+++ b/patches/server/0372-Ensure-Entity-position-and-AABB-are-never-invalid.patch
diff --git a/patches/server/0374-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0373-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 5b790d236b..83b24b5924 100644
--- a/patches/server/0374-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0373-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 2d25ba18d3db4b3eea8bd30812656f1ade4c2a67..6c9026cf224cf9dc75a5f61f1c051e640d1887ed 100644
+index 0370d26bd1e1d2fe1d640b052aca8a9c05dcb9dc..dd5f74fe4c8ca81b1d1102805ea8acb9087ba91e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -837,7 +837,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -836,7 +836,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          worldloadlistener.stop();
          // CraftBukkit start
          // this.updateMobSpawningFlags();
@@ -20,7 +20,7 @@ index 2d25ba18d3db4b3eea8bd30812656f1ade4c2a67..6c9026cf224cf9dc75a5f61f1c051e64
  
          this.forceTicks = false;
          // CraftBukkit end
-@@ -1848,11 +1848,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1846,11 +1846,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
      }
  
@@ -40,7 +40,7 @@ index 2d25ba18d3db4b3eea8bd30812656f1ade4c2a67..6c9026cf224cf9dc75a5f61f1c051e64
          }
      }
  
-@@ -1866,7 +1869,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1864,7 +1867,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
  
@@ -89,7 +89,7 @@ index e242ca5ec8c50bfd81b8ab1429e6e4e441025a75..d2eb8c619905d87a38820a4c1179ad93
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1b3f1b06155e114cd5ab76a406c1b4e745ef58c6..52e8664f8d0368daed43e349aa67e3b295697f26 100644
+index 610661dec58b9170d2eb2093c7fab81585ff9a2c..89c4763b990ca9e801ee16c4a50e806740d061d9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -996,8 +996,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0375-Paper-dumpitem-command.patch b/patches/server/0374-Paper-dumpitem-command.patch
index 088efe087c..088efe087c 100644
--- a/patches/server/0375-Paper-dumpitem-command.patch
+++ b/patches/server/0374-Paper-dumpitem-command.patch
diff --git a/patches/server/0376-Improve-Legacy-Component-serialization-size.patch b/patches/server/0375-Improve-Legacy-Component-serialization-size.patch
index 5a1da5d1f0..5a1da5d1f0 100644
--- a/patches/server/0376-Improve-Legacy-Component-serialization-size.patch
+++ b/patches/server/0375-Improve-Legacy-Component-serialization-size.patch
diff --git a/patches/server/0377-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0376-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index c709376967..fff3dfb4d9 100644
--- a/patches/server/0377-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0376-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
@@ -22,7 +22,7 @@ wants it to collect even faster, they can restore that setting back to 1 instead
 Not adding it to .getType() though to keep behavior consistent with vanilla for performance reasons.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 52e8664f8d0368daed43e349aa67e3b295697f26..9c022b16d143cff10015936af8f4b157b5173079 100644
+index 89c4763b990ca9e801ee16c4a50e806740d061d9..0b288cc080869efed42a28be682f7b68f8691416 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -380,7 +380,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0378-Add-BlockStateMeta-clearBlockState.patch b/patches/server/0377-Add-BlockStateMeta-clearBlockState.patch
index 680235a49a..680235a49a 100644
--- a/patches/server/0378-Add-BlockStateMeta-clearBlockState.patch
+++ b/patches/server/0377-Add-BlockStateMeta-clearBlockState.patch
diff --git a/patches/server/0379-Convert-legacy-attributes-in-Item-Meta.patch b/patches/server/0378-Convert-legacy-attributes-in-Item-Meta.patch
index 76437f1a9b..76437f1a9b 100644
--- a/patches/server/0379-Convert-legacy-attributes-in-Item-Meta.patch
+++ b/patches/server/0378-Convert-legacy-attributes-in-Item-Meta.patch
diff --git a/patches/server/0380-Do-not-accept-invalid-client-settings.patch b/patches/server/0379-Do-not-accept-invalid-client-settings.patch
index e0e0f8912e..e0e0f8912e 100644
--- a/patches/server/0380-Do-not-accept-invalid-client-settings.patch
+++ b/patches/server/0379-Do-not-accept-invalid-client-settings.patch
diff --git a/patches/server/0381-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/server/0380-Improve-fix-EntityTargetLivingEntityEvent.patch
index 29703174a1..29703174a1 100644
--- a/patches/server/0381-Improve-fix-EntityTargetLivingEntityEvent.patch
+++ b/patches/server/0380-Improve-fix-EntityTargetLivingEntityEvent.patch
diff --git a/patches/server/0382-Add-entity-liquid-API.patch b/patches/server/0381-Add-entity-liquid-API.patch
index 51765a7f3a..51765a7f3a 100644
--- a/patches/server/0382-Add-entity-liquid-API.patch
+++ b/patches/server/0381-Add-entity-liquid-API.patch
diff --git a/patches/server/0383-Add-PrepareResultEvent.patch b/patches/server/0382-Add-PrepareResultEvent.patch
index ffb4806752..985e40f2ae 100644
--- a/patches/server/0383-Add-PrepareResultEvent.patch
+++ b/patches/server/0382-Add-PrepareResultEvent.patch
@@ -94,7 +94,7 @@ index 30ea1f9e97db86a2ad7baeea4f5a76c821874daa..5b4f03128499b0c1a4b8c5f5ccd17e4b
  
      private static SingleRecipeInput createRecipeInput(Container inventory) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 752aba27c3eb9815bdd2b4683483c70e891711e7..44fd82bf887e5c6d946d7eed18e21f966efda9de 100644
+index f3ec3d14e66b9c1dff32088d4aef57e21265048c..f633d08b35bf9018367a449cc000c6c6ca5a44cd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1681,6 +1681,12 @@ public class CraftEventFactory {
diff --git a/patches/server/0384-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0383-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
index 9742de370e..24d5f2e649 100644
--- a/patches/server/0384-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
+++ b/patches/server/0383-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c0bbeaa4a37c1ba9f5125a0c68f4511aac6a0e71..c9ef71184cdf73ca275331a5b99902426c5df436 100644
+index 8920099eb488c37b036b7bd97fbd4f7db505c77c..906e8589483b93bcdb55677f7f942f6c7a89caf8 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3659,7 +3659,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0385-Fix-arrows-never-despawning-MC-125757.patch b/patches/server/0384-Fix-arrows-never-despawning-MC-125757.patch
index dbcb4ce450..dbcb4ce450 100644
--- a/patches/server/0385-Fix-arrows-never-despawning-MC-125757.patch
+++ b/patches/server/0384-Fix-arrows-never-despawning-MC-125757.patch
diff --git a/patches/server/0386-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/server/0385-Thread-Safe-Vanilla-Command-permission-checking.patch
index a210e43dce..a210e43dce 100644
--- a/patches/server/0386-Thread-Safe-Vanilla-Command-permission-checking.patch
+++ b/patches/server/0385-Thread-Safe-Vanilla-Command-permission-checking.patch
diff --git a/patches/server/0387-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/server/0386-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
index fe347fabc4..fe347fabc4 100644
--- a/patches/server/0387-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
+++ b/patches/server/0386-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch
diff --git a/patches/server/0388-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/server/0387-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
index df26348fac..df26348fac 100644
--- a/patches/server/0388-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
+++ b/patches/server/0387-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch
diff --git a/patches/server/0389-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/server/0388-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
index 5f0bca47b3..5f0bca47b3 100644
--- a/patches/server/0389-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
+++ b/patches/server/0388-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch
diff --git a/patches/server/0390-Optimize-NetworkManager-Exception-Handling.patch b/patches/server/0389-Optimize-NetworkManager-Exception-Handling.patch
index 8626e3b900..8626e3b900 100644
--- a/patches/server/0390-Optimize-NetworkManager-Exception-Handling.patch
+++ b/patches/server/0389-Optimize-NetworkManager-Exception-Handling.patch
diff --git a/patches/server/0391-Fix-some-rails-connecting-improperly.patch b/patches/server/0390-Fix-some-rails-connecting-improperly.patch
index 4f5cd86538..4f5cd86538 100644
--- a/patches/server/0391-Fix-some-rails-connecting-improperly.patch
+++ b/patches/server/0390-Fix-some-rails-connecting-improperly.patch
diff --git a/patches/server/0392-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/server/0391-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
index 75cd32bb83..75cd32bb83 100644
--- a/patches/server/0392-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
+++ b/patches/server/0391-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch
diff --git a/patches/server/0393-Brand-support.patch b/patches/server/0392-Brand-support.patch
index af42b533fd..af42b533fd 100644
--- a/patches/server/0393-Brand-support.patch
+++ b/patches/server/0392-Brand-support.patch
diff --git a/patches/server/0394-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/server/0393-Add-playPickupItemAnimation-to-LivingEntity.patch
index 7fe52b1b6a..7fe52b1b6a 100644
--- a/patches/server/0394-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/server/0393-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/server/0395-Don-t-require-FACING-data.patch b/patches/server/0394-Don-t-require-FACING-data.patch
index 2cec1e5276..2cec1e5276 100644
--- a/patches/server/0395-Don-t-require-FACING-data.patch
+++ b/patches/server/0394-Don-t-require-FACING-data.patch
diff --git a/patches/server/0396-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0395-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
index 37342b6ffe..37342b6ffe 100644
--- a/patches/server/0396-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
+++ b/patches/server/0395-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
diff --git a/patches/server/0397-Add-moon-phase-API.patch b/patches/server/0396-Add-moon-phase-API.patch
index 539ccca6de..539ccca6de 100644
--- a/patches/server/0397-Add-moon-phase-API.patch
+++ b/patches/server/0396-Add-moon-phase-API.patch
diff --git a/patches/server/0398-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/server/0397-Do-not-let-the-server-load-chunks-from-newer-version.patch
index 9ada63fcdf..9ada63fcdf 100644
--- a/patches/server/0398-Do-not-let-the-server-load-chunks-from-newer-version.patch
+++ b/patches/server/0397-Do-not-let-the-server-load-chunks-from-newer-version.patch
diff --git a/patches/server/0399-Prevent-headless-pistons-from-being-created.patch b/patches/server/0398-Prevent-headless-pistons-from-being-created.patch
index 58b77cb5be..58b77cb5be 100644
--- a/patches/server/0399-Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/0398-Prevent-headless-pistons-from-being-created.patch
diff --git a/patches/server/0400-Add-BellRingEvent.patch b/patches/server/0399-Add-BellRingEvent.patch
index b774d09a82..6a7c834c6a 100644
--- a/patches/server/0400-Add-BellRingEvent.patch
+++ b/patches/server/0399-Add-BellRingEvent.patch
@@ -7,7 +7,7 @@ Add a new event, BellRingEvent, to trigger whenever a player rings a
 village bell. Passes along the bell block and the player who rang it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 44fd82bf887e5c6d946d7eed18e21f966efda9de..241e6527575c6d6b4facbd3ae1e4a8b65708e397 100644
+index f633d08b35bf9018367a449cc000c6c6ca5a44cd..dbe7931dd7eb43f9381463d3a57ba1eb53820985 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -378,10 +378,11 @@ public class CraftEventFactory {
diff --git a/patches/server/0401-Add-zombie-targets-turtle-egg-config.patch b/patches/server/0400-Add-zombie-targets-turtle-egg-config.patch
index 56529e1fd4..56529e1fd4 100644
--- a/patches/server/0401-Add-zombie-targets-turtle-egg-config.patch
+++ b/patches/server/0400-Add-zombie-targets-turtle-egg-config.patch
diff --git a/patches/server/0402-Buffer-joins-to-world.patch b/patches/server/0401-Buffer-joins-to-world.patch
index 2e31ea4385..2e31ea4385 100644
--- a/patches/server/0402-Buffer-joins-to-world.patch
+++ b/patches/server/0401-Buffer-joins-to-world.patch
diff --git a/patches/server/0403-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/server/0402-Fix-hex-colors-not-working-in-some-kick-messages.patch
index 6124f32529..6124f32529 100644
--- a/patches/server/0403-Fix-hex-colors-not-working-in-some-kick-messages.patch
+++ b/patches/server/0402-Fix-hex-colors-not-working-in-some-kick-messages.patch
diff --git a/patches/server/0404-Add-more-Evoker-API.patch b/patches/server/0403-Add-more-Evoker-API.patch
index f44eceff55..f44eceff55 100644
--- a/patches/server/0404-Add-more-Evoker-API.patch
+++ b/patches/server/0403-Add-more-Evoker-API.patch
diff --git a/patches/server/0405-Add-methods-to-get-translation-keys.patch b/patches/server/0404-Add-methods-to-get-translation-keys.patch
index 5b5a9288df..2aaeb8a7a6 100644
--- a/patches/server/0405-Add-methods-to-get-translation-keys.patch
+++ b/patches/server/0404-Add-methods-to-get-translation-keys.patch
@@ -80,7 +80,7 @@ index d20fdd4f06faa09c7d9f9e04f379cf0fa68db9bb..66d773cadb74f9176e6cf68a56556803
 +    // Paper end - add Translatable
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java
-index 56dad5ebba54642e783146f1233d6ef44bb866a5..8725cd736d255b070f9f8ce7cf47b21e2407fbdd 100644
+index 4921fc085c9d60c74028ef390325e26c598e8df1..4941e0afff8df5f10f06c715b54bf58eb86051c5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaFirework.java
 @@ -123,7 +123,7 @@ class CraftMetaFirework extends CraftMetaItem implements FireworkMeta {
diff --git a/patches/server/0406-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/server/0405-Create-HoverEvent-from-ItemStack-Entity.patch
index 081d6c07e5..081d6c07e5 100644
--- a/patches/server/0406-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/server/0405-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/server/0407-Cache-block-data-strings.patch b/patches/server/0406-Cache-block-data-strings.patch
index 28a1635b20..d9ac173303 100644
--- a/patches/server/0407-Cache-block-data-strings.patch
+++ b/patches/server/0406-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 6c9026cf224cf9dc75a5f61f1c051e640d1887ed..b9ba0033542bae48678e0321fbe0633a711291a5 100644
+index dd5f74fe4c8ca81b1d1102805ea8acb9087ba91e..d2866b9f7e6c8f0ca30d451c93c56caefb2c1b5c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2147,6 +2147,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2145,6 +2145,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/0408-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/server/0407-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
index dce8c6c40b..b5f30283e1 100644
--- a/patches/server/0408-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
+++ b/patches/server/0407-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
@@ -94,7 +94,7 @@ index 34321f095e12ea0cca34ff1ec00819c6350205a8..5f5788a502642463091fb76e98703aae
          this.entity.setYHeadRot(location.getYaw());
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 344ef786330d1247fdfb56ef04be130c9ffb7d8f..af5aab1755f80222a249b1cc7da595af78dccbbd 100644
+index cf17328aef60e5c6a0d168d2ed4d181cf47ee0b4..3cd21778018db5e05ee26ba35c34a89619b3d1d8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -590,6 +590,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
diff --git a/patches/server/0409-Add-additional-open-container-api-to-HumanEntity.patch b/patches/server/0408-Add-additional-open-container-api-to-HumanEntity.patch
index 15f9a92e44..15f9a92e44 100644
--- a/patches/server/0409-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/server/0408-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/server/0410-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/server/0409-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
index 9a0c6f1492..9a0c6f1492 100644
--- a/patches/server/0410-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
+++ b/patches/server/0409-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch
diff --git a/patches/server/0411-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/server/0410-Extend-block-drop-capture-to-capture-all-items-added.patch
index 9cb478d120..9cb478d120 100644
--- a/patches/server/0411-Extend-block-drop-capture-to-capture-all-items-added.patch
+++ b/patches/server/0410-Extend-block-drop-capture-to-capture-all-items-added.patch
diff --git a/patches/server/0412-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/server/0411-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 7a0217f4f0..7a0217f4f0 100644
--- a/patches/server/0412-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/server/0411-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/server/0413-Lazily-track-plugin-scoreboards-by-default.patch b/patches/server/0412-Lazily-track-plugin-scoreboards-by-default.patch
index 28ae9df043..28ae9df043 100644
--- a/patches/server/0413-Lazily-track-plugin-scoreboards-by-default.patch
+++ b/patches/server/0412-Lazily-track-plugin-scoreboards-by-default.patch
diff --git a/patches/server/0414-Entity-isTicking.patch b/patches/server/0413-Entity-isTicking.patch
index 502eb20937..502eb20937 100644
--- a/patches/server/0414-Entity-isTicking.patch
+++ b/patches/server/0413-Entity-isTicking.patch
diff --git a/patches/server/0415-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/server/0414-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
index 18a0880395..284340c436 100644
--- a/patches/server/0415-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch
+++ b/patches/server/0414-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 b9ba0033542bae48678e0321fbe0633a711291a5..055172644d6a3c30b512262fcba940610161b8d7 100644
+index d2866b9f7e6c8f0ca30d451c93c56caefb2c1b5c..05aa3323e9ae971fba5ab8c6c319c7805a3808aa 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2272,13 +2272,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2270,13 +2270,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/0416-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/server/0415-Fix-Concurrency-issue-in-ShufflingList.patch
index f04a40e1ac..f04a40e1ac 100644
--- a/patches/server/0416-Fix-Concurrency-issue-in-ShufflingList.patch
+++ b/patches/server/0415-Fix-Concurrency-issue-in-ShufflingList.patch
diff --git a/patches/server/0417-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0416-Reset-Ender-Crystals-on-Dragon-Spawn.patch
index bc690f31a3..bc690f31a3 100644
--- a/patches/server/0417-Reset-Ender-Crystals-on-Dragon-Spawn.patch
+++ b/patches/server/0416-Reset-Ender-Crystals-on-Dragon-Spawn.patch
diff --git a/patches/server/0418-Fix-for-large-move-vectors-crashing-server.patch b/patches/server/0417-Fix-for-large-move-vectors-crashing-server.patch
index 251671c2f1..251671c2f1 100644
--- a/patches/server/0418-Fix-for-large-move-vectors-crashing-server.patch
+++ b/patches/server/0417-Fix-for-large-move-vectors-crashing-server.patch
diff --git a/patches/server/0419-Optimise-getType-calls.patch b/patches/server/0418-Optimise-getType-calls.patch
index 1b14b0202b..1b14b0202b 100644
--- a/patches/server/0419-Optimise-getType-calls.patch
+++ b/patches/server/0418-Optimise-getType-calls.patch
diff --git a/patches/server/0420-Villager-resetOffers.patch b/patches/server/0419-Villager-resetOffers.patch
index ce8f9949cd..ce8f9949cd 100644
--- a/patches/server/0420-Villager-resetOffers.patch
+++ b/patches/server/0419-Villager-resetOffers.patch
diff --git a/patches/server/0421-Retain-block-place-order-when-capturing-blockstates.patch b/patches/server/0420-Retain-block-place-order-when-capturing-blockstates.patch
index bac1a1074b..bac1a1074b 100644
--- a/patches/server/0421-Retain-block-place-order-when-capturing-blockstates.patch
+++ b/patches/server/0420-Retain-block-place-order-when-capturing-blockstates.patch
diff --git a/patches/server/0422-Fix-item-locations-dropped-from-campfires.patch b/patches/server/0421-Fix-item-locations-dropped-from-campfires.patch
index 26a43eb186..26a43eb186 100644
--- a/patches/server/0422-Fix-item-locations-dropped-from-campfires.patch
+++ b/patches/server/0421-Fix-item-locations-dropped-from-campfires.patch
diff --git a/patches/server/0423-Fix-bell-block-entity-memory-leak.patch b/patches/server/0422-Fix-bell-block-entity-memory-leak.patch
index 5343b073cd..5343b073cd 100644
--- a/patches/server/0423-Fix-bell-block-entity-memory-leak.patch
+++ b/patches/server/0422-Fix-bell-block-entity-memory-leak.patch
diff --git a/patches/server/0424-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/server/0423-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
index 6ab78855c4..6ab78855c4 100644
--- a/patches/server/0424-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
+++ b/patches/server/0423-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch
diff --git a/patches/server/0425-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0424-Add-getOfflinePlayerIfCached-String.patch
index 368490ced4..8b286c9c12 100644
--- a/patches/server/0425-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0424-Add-getOfflinePlayerIfCached-String.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9c022b16d143cff10015936af8f4b157b5173079..75fe99d8ec74435cf62b427d6bed89c76c0cf6d9 100644
+index 0b288cc080869efed42a28be682f7b68f8691416..ae594610d1c5665aa142522a9cbb97cf6e4d10f2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1963,6 +1963,28 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0426-Add-ignore-discounts-API.patch b/patches/server/0425-Add-ignore-discounts-API.patch
index 65a552a605..65a552a605 100644
--- a/patches/server/0426-Add-ignore-discounts-API.patch
+++ b/patches/server/0425-Add-ignore-discounts-API.patch
diff --git a/patches/server/0427-Toggle-for-removing-existing-dragon.patch b/patches/server/0426-Toggle-for-removing-existing-dragon.patch
index 26ae1ded8a..26ae1ded8a 100644
--- a/patches/server/0427-Toggle-for-removing-existing-dragon.patch
+++ b/patches/server/0426-Toggle-for-removing-existing-dragon.patch
diff --git a/patches/server/0428-Fix-client-lag-on-advancement-loading.patch b/patches/server/0427-Fix-client-lag-on-advancement-loading.patch
index 62630304af..62630304af 100644
--- a/patches/server/0428-Fix-client-lag-on-advancement-loading.patch
+++ b/patches/server/0427-Fix-client-lag-on-advancement-loading.patch
diff --git a/patches/server/0429-Item-no-age-no-player-pickup.patch b/patches/server/0428-Item-no-age-no-player-pickup.patch
index 1fffbaf558..1fffbaf558 100644
--- a/patches/server/0429-Item-no-age-no-player-pickup.patch
+++ b/patches/server/0428-Item-no-age-no-player-pickup.patch
diff --git a/patches/server/0430-Beacon-API-custom-effect-ranges.patch b/patches/server/0429-Beacon-API-custom-effect-ranges.patch
index b80f1772cd..b80f1772cd 100644
--- a/patches/server/0430-Beacon-API-custom-effect-ranges.patch
+++ b/patches/server/0429-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/server/0431-Add-API-for-quit-reason.patch b/patches/server/0430-Add-API-for-quit-reason.patch
index c4ed7bf11f..c4ed7bf11f 100644
--- a/patches/server/0431-Add-API-for-quit-reason.patch
+++ b/patches/server/0430-Add-API-for-quit-reason.patch
diff --git a/patches/server/0432-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/server/0431-Add-Wandering-Trader-spawn-rate-config-options.patch
index 98525387d7..98525387d7 100644
--- a/patches/server/0432-Add-Wandering-Trader-spawn-rate-config-options.patch
+++ b/patches/server/0431-Add-Wandering-Trader-spawn-rate-config-options.patch
diff --git a/patches/server/0433-Add-Destroy-Speed-API.patch b/patches/server/0432-Add-Destroy-Speed-API.patch
index 43e752ecb5..43e752ecb5 100644
--- a/patches/server/0433-Add-Destroy-Speed-API.patch
+++ b/patches/server/0432-Add-Destroy-Speed-API.patch
diff --git a/patches/server/0434-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/0433-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
index a099a492e9..e34ff10d4d 100644
--- a/patches/server/0434-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
+++ b/patches/server/0433-Fix-Player-spawnParticle-x-y-z-precision-loss.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix Player spawnParticle x/y/z precision loss
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 12e38fcbd3a3bcf102244a2b246c090c57ef327b..39e8dff2a1b62b8313b4d87ce8d2fad7516452c3 100644
+index 854533854dfba24b59a15265ac759331e3ddfc74..73fde8be0098238582fb3661ae67d4139be417dc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2707,7 +2707,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0435-Add-LivingEntity-clearActiveItem.patch b/patches/server/0434-Add-LivingEntity-clearActiveItem.patch
index e3b86150d3..e3b86150d3 100644
--- a/patches/server/0435-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/server/0434-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/server/0436-Add-PlayerItemCooldownEvent.patch b/patches/server/0435-Add-PlayerItemCooldownEvent.patch
index 4b90903dd2..4b90903dd2 100644
--- a/patches/server/0436-Add-PlayerItemCooldownEvent.patch
+++ b/patches/server/0435-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/server/0437-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0436-Significantly-improve-performance-of-the-end-generat.patch
index ed3ee50bc9..ed3ee50bc9 100644
--- a/patches/server/0437-Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/server/0436-Significantly-improve-performance-of-the-end-generat.patch
diff --git a/patches/server/0438-More-lightning-API.patch b/patches/server/0437-More-lightning-API.patch
index 967871902a..967871902a 100644
--- a/patches/server/0438-More-lightning-API.patch
+++ b/patches/server/0437-More-lightning-API.patch
diff --git a/patches/server/0439-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/server/0438-Climbing-should-not-bypass-cramming-gamerule.patch
index bf6771889d..0f9101c994 100644
--- a/patches/server/0439-Climbing-should-not-bypass-cramming-gamerule.patch
+++ b/patches/server/0438-Climbing-should-not-bypass-cramming-gamerule.patch
@@ -44,7 +44,7 @@ index eb425fac573881f3aad09ae75a32184fb0e325a6..302decdccd37c5579473c8fc33adda39
              } else if (entity1 instanceof Player && entity instanceof Player && !io.papermc.paper.configuration.GlobalConfiguration.get().collisions.enablePlayerCollisions) { // Paper - Configurable player collision
                  return false;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c9ef71184cdf73ca275331a5b99902426c5df436..40b86b9b25135e55cc01e502dbc8cc22344efa5d 100644
+index 906e8589483b93bcdb55677f7f942f6c7a89caf8..d94c3e86885c5a8ba636988d29f98b496e13b627 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3573,7 +3573,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -129,7 +129,7 @@ index cc1189c2d7dc57ba8f29aad4ba5d2a07362bcd5b..5bcb9a53ebebeef4bd6ec2458df4b630
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
-index 41590a758ae29e35e2d1fd410662888d4cd3fe36..119d6f4ec8ca6867f75f9fd2f1dc46962f16afee 100644
+index 351e581c55d38e652fc3397f95a0837a6ee3656c..4d8c14d3a42f3e4b963cf5f8fa764df79813912b 100644
 --- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
 +++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
 @@ -169,7 +169,7 @@ public abstract class AbstractMinecart extends VehicleEntity {
diff --git a/patches/server/0440-Add-missing-default-perms-for-commands.patch b/patches/server/0439-Add-missing-default-perms-for-commands.patch
index d49628ee32..d49628ee32 100644
--- a/patches/server/0440-Add-missing-default-perms-for-commands.patch
+++ b/patches/server/0439-Add-missing-default-perms-for-commands.patch
diff --git a/patches/server/0441-Add-PlayerShearBlockEvent.patch b/patches/server/0440-Add-PlayerShearBlockEvent.patch
index c659b655c0..c659b655c0 100644
--- a/patches/server/0441-Add-PlayerShearBlockEvent.patch
+++ b/patches/server/0440-Add-PlayerShearBlockEvent.patch
diff --git a/patches/server/0442-Limit-recipe-packets.patch b/patches/server/0441-Limit-recipe-packets.patch
index a18fe75650..a18fe75650 100644
--- a/patches/server/0442-Limit-recipe-packets.patch
+++ b/patches/server/0441-Limit-recipe-packets.patch
diff --git a/patches/server/0443-Fix-CraftSound-backwards-compatibility.patch b/patches/server/0442-Fix-CraftSound-backwards-compatibility.patch
index 9ca7f86992..9ca7f86992 100644
--- a/patches/server/0443-Fix-CraftSound-backwards-compatibility.patch
+++ b/patches/server/0442-Fix-CraftSound-backwards-compatibility.patch
diff --git a/patches/server/0444-Player-Chunk-Load-Unload-Events.patch b/patches/server/0443-Player-Chunk-Load-Unload-Events.patch
index 0fee853cd3..0fee853cd3 100644
--- a/patches/server/0444-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/server/0443-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/server/0445-Optimize-Dynamic-get-Missing-Keys.patch b/patches/server/0444-Optimize-Dynamic-get-Missing-Keys.patch
index e8bbac8b76..e8bbac8b76 100644
--- a/patches/server/0445-Optimize-Dynamic-get-Missing-Keys.patch
+++ b/patches/server/0444-Optimize-Dynamic-get-Missing-Keys.patch
diff --git a/patches/server/0446-Expose-LivingEntity-hurt-direction.patch b/patches/server/0445-Expose-LivingEntity-hurt-direction.patch
index d0db144113..d0db144113 100644
--- a/patches/server/0446-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/server/0445-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/server/0447-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/server/0446-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 11a90a4f27..f1f4c227ee 100644
--- a/patches/server/0447-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/server/0446-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 241e6527575c6d6b4facbd3ae1e4a8b65708e397..f4a1f96340f8521bc2fecfb2565f7cc8c6453d47 100644
+index dbe7931dd7eb43f9381463d3a57ba1eb53820985..24fcb0eb139174671ffb7a8e5222ec9833835f87 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -313,6 +313,10 @@ public class CraftEventFactory {
diff --git a/patches/server/0448-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch b/patches/server/0447-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
index 7ac0fb0202..7ac0fb0202 100644
--- a/patches/server/0448-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
+++ b/patches/server/0447-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch
diff --git a/patches/server/0449-Add-TargetHitEvent.patch b/patches/server/0448-Add-TargetHitEvent.patch
index 816c525fd2..816c525fd2 100644
--- a/patches/server/0449-Add-TargetHitEvent.patch
+++ b/patches/server/0448-Add-TargetHitEvent.patch
diff --git a/patches/server/0450-MC-4-Fix-item-position-desync.patch b/patches/server/0449-MC-4-Fix-item-position-desync.patch
index 3f4003c4f5..3f4003c4f5 100644
--- a/patches/server/0450-MC-4-Fix-item-position-desync.patch
+++ b/patches/server/0449-MC-4-Fix-item-position-desync.patch
diff --git a/patches/server/0451-Additional-Block-Material-API.patch b/patches/server/0450-Additional-Block-Material-API.patch
index 81728edf48..81728edf48 100644
--- a/patches/server/0451-Additional-Block-Material-API.patch
+++ b/patches/server/0450-Additional-Block-Material-API.patch
diff --git a/patches/server/0452-Fix-harming-potion-dupe.patch b/patches/server/0451-Fix-harming-potion-dupe.patch
index b184bf641c..b184bf641c 100644
--- a/patches/server/0452-Fix-harming-potion-dupe.patch
+++ b/patches/server/0451-Fix-harming-potion-dupe.patch
diff --git a/patches/server/0453-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/server/0452-API-to-get-Material-from-Boats-and-Minecarts.patch
index 9bcb17ad14..9bcb17ad14 100644
--- a/patches/server/0453-API-to-get-Material-from-Boats-and-Minecarts.patch
+++ b/patches/server/0452-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/server/0454-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/server/0453-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
index da8441444c..da8441444c 100644
--- a/patches/server/0454-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
+++ b/patches/server/0453-Allow-disabling-mob-spawner-spawn-egg-transformation.patch
diff --git a/patches/server/0455-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/server/0454-Fix-Not-a-string-Map-Conversion-spam.patch
index 5b2328afe8..5b2328afe8 100644
--- a/patches/server/0455-Fix-Not-a-string-Map-Conversion-spam.patch
+++ b/patches/server/0454-Fix-Not-a-string-Map-Conversion-spam.patch
diff --git a/patches/server/0456-Add-PlayerFlowerPotManipulateEvent.patch b/patches/server/0455-Add-PlayerFlowerPotManipulateEvent.patch
index 8b61833059..8b61833059 100644
--- a/patches/server/0456-Add-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/server/0455-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/server/0457-Fix-interact-event-not-being-called-sometimes.patch b/patches/server/0456-Fix-interact-event-not-being-called-sometimes.patch
index fc4bcdc2d1..fc4bcdc2d1 100644
--- a/patches/server/0457-Fix-interact-event-not-being-called-sometimes.patch
+++ b/patches/server/0456-Fix-interact-event-not-being-called-sometimes.patch
diff --git a/patches/server/0458-Zombie-API-breaking-doors.patch b/patches/server/0457-Zombie-API-breaking-doors.patch
index 50bb6965cf..50bb6965cf 100644
--- a/patches/server/0458-Zombie-API-breaking-doors.patch
+++ b/patches/server/0457-Zombie-API-breaking-doors.patch
diff --git a/patches/server/0459-Fix-nerfed-slime-when-splitting.patch b/patches/server/0458-Fix-nerfed-slime-when-splitting.patch
index a32a88f5ad..a32a88f5ad 100644
--- a/patches/server/0459-Fix-nerfed-slime-when-splitting.patch
+++ b/patches/server/0458-Fix-nerfed-slime-when-splitting.patch
diff --git a/patches/server/0460-Add-EntityLoadCrossbowEvent.patch b/patches/server/0459-Add-EntityLoadCrossbowEvent.patch
index a2f95139f8..a2f95139f8 100644
--- a/patches/server/0460-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/server/0459-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/server/0461-Add-WorldGameRuleChangeEvent.patch b/patches/server/0460-Add-WorldGameRuleChangeEvent.patch
index 737b50a1b8..737b50a1b8 100644
--- a/patches/server/0461-Add-WorldGameRuleChangeEvent.patch
+++ b/patches/server/0460-Add-WorldGameRuleChangeEvent.patch
diff --git a/patches/server/0462-Add-ServerResourcesReloadedEvent.patch b/patches/server/0461-Add-ServerResourcesReloadedEvent.patch
index 8996d46e70..830f76c615 100644
--- a/patches/server/0462-Add-ServerResourcesReloadedEvent.patch
+++ b/patches/server/0461-Add-ServerResourcesReloadedEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add ServerResourcesReloadedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 055172644d6a3c30b512262fcba940610161b8d7..84028b8ad189407f89fbdd63d3e185c86335b596 100644
+index 05aa3323e9ae971fba5ab8c6c319c7805a3808aa..39ce74bc3fbb282f56028273d53f980171bdb464 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2116,7 +2116,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2114,7 +2114,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return this.functionManager;
      }
  
@@ -22,7 +22,7 @@ index 055172644d6a3c30b512262fcba940610161b8d7..84028b8ad189407f89fbdd63d3e185c8
          CompletableFuture<Void> completablefuture = CompletableFuture.supplyAsync(() -> {
              Stream<String> stream = dataPacks.stream(); // CraftBukkit - decompile error
              PackRepository resourcepackrepository = this.packRepository;
-@@ -2148,6 +2154,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2146,6 +2152,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/0463-Add-world-settings-for-mobs-picking-up-loot.patch b/patches/server/0462-Add-world-settings-for-mobs-picking-up-loot.patch
index a6e23dc931..a6e23dc931 100644
--- a/patches/server/0463-Add-world-settings-for-mobs-picking-up-loot.patch
+++ b/patches/server/0462-Add-world-settings-for-mobs-picking-up-loot.patch
diff --git a/patches/server/0464-Add-BlockFailedDispenseEvent.patch b/patches/server/0463-Add-BlockFailedDispenseEvent.patch
index 7fd4f0505f..d293da6e03 100644
--- a/patches/server/0464-Add-BlockFailedDispenseEvent.patch
+++ b/patches/server/0463-Add-BlockFailedDispenseEvent.patch
@@ -32,7 +32,7 @@ index a08e8571f3a83afc80c2f1758a9029cd28ed6947..91b514967405115f22edf4255775361a
              } else {
                  ItemStack itemstack = tileentitydispenser.getItem(i);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f4a1f96340f8521bc2fecfb2565f7cc8c6453d47..c5166b0876eb925d30803277beb181ee01120586 100644
+index 24fcb0eb139174671ffb7a8e5222ec9833835f87..9e67dc35ea12149265517b951a96828460b2ca67 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -2127,4 +2127,12 @@ public class CraftEventFactory {
diff --git a/patches/server/0465-Add-PlayerLecternPageChangeEvent.patch b/patches/server/0464-Add-PlayerLecternPageChangeEvent.patch
index 15052d962d..15052d962d 100644
--- a/patches/server/0465-Add-PlayerLecternPageChangeEvent.patch
+++ b/patches/server/0464-Add-PlayerLecternPageChangeEvent.patch
diff --git a/patches/server/0466-Add-PlayerLoomPatternSelectEvent.patch b/patches/server/0465-Add-PlayerLoomPatternSelectEvent.patch
index f7032ecdde..f7032ecdde 100644
--- a/patches/server/0466-Add-PlayerLoomPatternSelectEvent.patch
+++ b/patches/server/0465-Add-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/server/0467-Configurable-door-breaking-difficulty.patch b/patches/server/0466-Configurable-door-breaking-difficulty.patch
index 679bb5f5e7..679bb5f5e7 100644
--- a/patches/server/0467-Configurable-door-breaking-difficulty.patch
+++ b/patches/server/0466-Configurable-door-breaking-difficulty.patch
diff --git a/patches/server/0468-Empty-commands-shall-not-be-dispatched.patch b/patches/server/0467-Empty-commands-shall-not-be-dispatched.patch
index f58be08904..f58be08904 100644
--- a/patches/server/0468-Empty-commands-shall-not-be-dispatched.patch
+++ b/patches/server/0467-Empty-commands-shall-not-be-dispatched.patch
diff --git a/patches/server/0469-Remove-stale-POIs.patch b/patches/server/0468-Remove-stale-POIs.patch
index 02c2f1843b..02c2f1843b 100644
--- a/patches/server/0469-Remove-stale-POIs.patch
+++ b/patches/server/0468-Remove-stale-POIs.patch
diff --git a/patches/server/0470-Fix-villager-boat-exploit.patch b/patches/server/0469-Fix-villager-boat-exploit.patch
index 23eb1f4bdb..5856a8c32b 100644
--- a/patches/server/0470-Fix-villager-boat-exploit.patch
+++ b/patches/server/0469-Fix-villager-boat-exploit.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix villager boat exploit
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 45e7b41f746ceb2ef295a81fa65795df062844ef..23bd0e0b62fef174b55b5915a44fee32db02c656 100644
+index 98eb00a8ee23543714d424d3ff5ca19887d6db19..9436a9614dea81d14c4f77cc21ca91f85ca87152 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -595,6 +595,14 @@ public abstract class PlayerList {
diff --git a/patches/server/0471-Add-sendOpLevel-API.patch b/patches/server/0470-Add-sendOpLevel-API.patch
index 3ae1ca741e..77f057bbd2 100644
--- a/patches/server/0471-Add-sendOpLevel-API.patch
+++ b/patches/server/0470-Add-sendOpLevel-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add sendOpLevel API
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index ffb94fd3e375d7a6520a57e8869583695745a722..40a7ba1b3edab95e245b227d61d5ea14812ceb2e 100644
+index 9436a9614dea81d14c4f77cc21ca91f85ca87152..9b94ca912f99a3a465f30130b24347fc9aca72ff 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1066,6 +1066,11 @@ public abstract class PlayerList {
@@ -32,7 +32,7 @@ index ffb94fd3e375d7a6520a57e8869583695745a722..40a7ba1b3edab95e245b227d61d5ea14
  
      public boolean isWhiteListed(GameProfile profile) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 39e8dff2a1b62b8313b4d87ce8d2fad7516452c3..3bc62788d63e98eb9b2a2b381272b262040dcb5f 100644
+index 73fde8be0098238582fb3661ae67d4139be417dc..7de53f6750d478a052bc8ade6edac056565fe068 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -677,6 +677,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0472-Add-RegistryAccess-for-managing-Registries.patch b/patches/server/0471-Add-RegistryAccess-for-managing-Registries.patch
index a13748ed84..a13748ed84 100644
--- a/patches/server/0472-Add-RegistryAccess-for-managing-Registries.patch
+++ b/patches/server/0471-Add-RegistryAccess-for-managing-Registries.patch
diff --git a/patches/server/0473-Add-StructuresLocateEvent.patch b/patches/server/0472-Add-StructuresLocateEvent.patch
index d8c688e2ae..d8c688e2ae 100644
--- a/patches/server/0473-Add-StructuresLocateEvent.patch
+++ b/patches/server/0472-Add-StructuresLocateEvent.patch
diff --git a/patches/server/0474-Collision-option-for-requiring-a-player-participant.patch b/patches/server/0473-Collision-option-for-requiring-a-player-participant.patch
index 28b12f77f8..28b12f77f8 100644
--- a/patches/server/0474-Collision-option-for-requiring-a-player-participant.patch
+++ b/patches/server/0473-Collision-option-for-requiring-a-player-participant.patch
diff --git a/patches/server/0475-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/server/0474-Return-chat-component-with-empty-text-instead-of-thr.patch
index af20b23c54..af20b23c54 100644
--- a/patches/server/0475-Return-chat-component-with-empty-text-instead-of-thr.patch
+++ b/patches/server/0474-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/server/0476-Make-schedule-command-per-world.patch b/patches/server/0475-Make-schedule-command-per-world.patch
index 2d8f63ad1e..2d8f63ad1e 100644
--- a/patches/server/0476-Make-schedule-command-per-world.patch
+++ b/patches/server/0475-Make-schedule-command-per-world.patch
diff --git a/patches/server/0477-Configurable-max-leash-distance.patch b/patches/server/0476-Configurable-max-leash-distance.patch
index d2f544737b..d2f544737b 100644
--- a/patches/server/0477-Configurable-max-leash-distance.patch
+++ b/patches/server/0476-Configurable-max-leash-distance.patch
diff --git a/patches/server/0478-Add-BlockPreDispenseEvent.patch b/patches/server/0477-Add-BlockPreDispenseEvent.patch
index 6e9bb3b216..6e9bb3b216 100644
--- a/patches/server/0478-Add-BlockPreDispenseEvent.patch
+++ b/patches/server/0477-Add-BlockPreDispenseEvent.patch
diff --git a/patches/server/0479-Add-PlayerChangeBeaconEffectEvent.patch b/patches/server/0478-Add-PlayerChangeBeaconEffectEvent.patch
index 1903c21ba8..1903c21ba8 100644
--- a/patches/server/0479-Add-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/server/0478-Add-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/server/0480-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/server/0479-Add-toggle-for-always-placing-the-dragon-egg.patch
index ccbab4766e..ccbab4766e 100644
--- a/patches/server/0480-Add-toggle-for-always-placing-the-dragon-egg.patch
+++ b/patches/server/0479-Add-toggle-for-always-placing-the-dragon-egg.patch
diff --git a/patches/server/0481-Add-PlayerStonecutterRecipeSelectEvent.patch b/patches/server/0480-Add-PlayerStonecutterRecipeSelectEvent.patch
index 0c96d8fa15..0c96d8fa15 100644
--- a/patches/server/0481-Add-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/server/0480-Add-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/server/0482-Expand-EntityUnleashEvent.patch b/patches/server/0481-Expand-EntityUnleashEvent.patch
index 39bfff3811..39bfff3811 100644
--- a/patches/server/0482-Expand-EntityUnleashEvent.patch
+++ b/patches/server/0481-Expand-EntityUnleashEvent.patch
diff --git a/patches/server/0483-Reset-shield-blocking-on-dimension-change.patch b/patches/server/0482-Reset-shield-blocking-on-dimension-change.patch
index f0f37986b6..f0f37986b6 100644
--- a/patches/server/0483-Reset-shield-blocking-on-dimension-change.patch
+++ b/patches/server/0482-Reset-shield-blocking-on-dimension-change.patch
diff --git a/patches/server/0484-Add-DragonEggFormEvent.patch b/patches/server/0483-Add-DragonEggFormEvent.patch
index 8a1ea59534..8a1ea59534 100644
--- a/patches/server/0484-Add-DragonEggFormEvent.patch
+++ b/patches/server/0483-Add-DragonEggFormEvent.patch
diff --git a/patches/server/0485-Add-EntityMoveEvent.patch b/patches/server/0484-Add-EntityMoveEvent.patch
index d8d3a7c5ca..9b7d66dfba 100644
--- a/patches/server/0485-Add-EntityMoveEvent.patch
+++ b/patches/server/0484-Add-EntityMoveEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add EntityMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 84028b8ad189407f89fbdd63d3e185c86335b596..d38cc3e642eb33759175227fbf86ed250cf0b9f3 100644
+index 39ce74bc3fbb282f56028273d53f980171bdb464..43b28b56c7949f95af5b7e99b04b93ed711d8880 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1607,6 +1607,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1605,6 +1605,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 - BlockPhysicsEvent
diff --git a/patches/server/0486-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/server/0485-added-option-to-disable-pathfinding-updates-on-block.patch
index e40ef31e16..e40ef31e16 100644
--- a/patches/server/0486-added-option-to-disable-pathfinding-updates-on-block.patch
+++ b/patches/server/0485-added-option-to-disable-pathfinding-updates-on-block.patch
diff --git a/patches/server/0487-Inline-shift-direction-fields.patch b/patches/server/0486-Inline-shift-direction-fields.patch
index 910b881e3a..910b881e3a 100644
--- a/patches/server/0487-Inline-shift-direction-fields.patch
+++ b/patches/server/0486-Inline-shift-direction-fields.patch
diff --git a/patches/server/0488-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/server/0487-Allow-adding-items-to-BlockDropItemEvent.patch
index 4753f93e41..4753f93e41 100644
--- a/patches/server/0488-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/server/0487-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/server/0489-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/server/0488-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 6ae0c8d11b..6ae0c8d11b 100644
--- a/patches/server/0489-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/server/0488-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/server/0490-living-entity-allow-attribute-registration.patch b/patches/server/0489-living-entity-allow-attribute-registration.patch
index 365f0f8320..365f0f8320 100644
--- a/patches/server/0490-living-entity-allow-attribute-registration.patch
+++ b/patches/server/0489-living-entity-allow-attribute-registration.patch
diff --git a/patches/server/0491-fix-dead-slime-setSize-invincibility.patch b/patches/server/0490-fix-dead-slime-setSize-invincibility.patch
index 494e56127e..494e56127e 100644
--- a/patches/server/0491-fix-dead-slime-setSize-invincibility.patch
+++ b/patches/server/0490-fix-dead-slime-setSize-invincibility.patch
diff --git a/patches/server/0492-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/server/0491-Merchant-getRecipes-should-return-an-immutable-list.patch
index d40a7cf8d7..d40a7cf8d7 100644
--- a/patches/server/0492-Merchant-getRecipes-should-return-an-immutable-list.patch
+++ b/patches/server/0491-Merchant-getRecipes-should-return-an-immutable-list.patch
diff --git a/patches/server/0493-Expose-Tracked-Players.patch b/patches/server/0492-Expose-Tracked-Players.patch
index d8ca4c111c..d8ca4c111c 100644
--- a/patches/server/0493-Expose-Tracked-Players.patch
+++ b/patches/server/0492-Expose-Tracked-Players.patch
diff --git a/patches/server/0494-Improve-ServerGUI.patch b/patches/server/0493-Improve-ServerGUI.patch
index 872206f5fe..872206f5fe 100644
--- a/patches/server/0494-Improve-ServerGUI.patch
+++ b/patches/server/0493-Improve-ServerGUI.patch
diff --git a/patches/server/0495-fix-converting-txt-to-json-file.patch b/patches/server/0494-fix-converting-txt-to-json-file.patch
index 2134c10628..2134c10628 100644
--- a/patches/server/0495-fix-converting-txt-to-json-file.patch
+++ b/patches/server/0494-fix-converting-txt-to-json-file.patch
diff --git a/patches/server/0496-Add-worldborder-events.patch b/patches/server/0495-Add-worldborder-events.patch
index 44a467547c..44a467547c 100644
--- a/patches/server/0496-Add-worldborder-events.patch
+++ b/patches/server/0495-Add-worldborder-events.patch
diff --git a/patches/server/0497-Add-PlayerNameEntityEvent.patch b/patches/server/0496-Add-PlayerNameEntityEvent.patch
index 9287edc1b7..9287edc1b7 100644
--- a/patches/server/0497-Add-PlayerNameEntityEvent.patch
+++ b/patches/server/0496-Add-PlayerNameEntityEvent.patch
diff --git a/patches/server/0498-Add-recipe-to-cook-events.patch b/patches/server/0497-Add-recipe-to-cook-events.patch
index 6fe8720d21..6fe8720d21 100644
--- a/patches/server/0498-Add-recipe-to-cook-events.patch
+++ b/patches/server/0497-Add-recipe-to-cook-events.patch
diff --git a/patches/server/0499-Add-Block-isValidTool.patch b/patches/server/0498-Add-Block-isValidTool.patch
index 5f36fb047c..5f36fb047c 100644
--- a/patches/server/0499-Add-Block-isValidTool.patch
+++ b/patches/server/0498-Add-Block-isValidTool.patch
diff --git a/patches/server/0500-Allow-using-signs-inside-spawn-protection.patch b/patches/server/0499-Allow-using-signs-inside-spawn-protection.patch
index 9f0399c60f..9f0399c60f 100644
--- a/patches/server/0500-Allow-using-signs-inside-spawn-protection.patch
+++ b/patches/server/0499-Allow-using-signs-inside-spawn-protection.patch
diff --git a/patches/server/0501-Expand-world-key-API.patch b/patches/server/0500-Expand-world-key-API.patch
index f2077e285b..f2077e285b 100644
--- a/patches/server/0501-Expand-world-key-API.patch
+++ b/patches/server/0500-Expand-world-key-API.patch
diff --git a/patches/server/0502-Add-fast-alternative-constructor-for-Rotations.patch b/patches/server/0501-Add-fast-alternative-constructor-for-Rotations.patch
index e28775fc9a..e28775fc9a 100644
--- a/patches/server/0502-Add-fast-alternative-constructor-for-Rotations.patch
+++ b/patches/server/0501-Add-fast-alternative-constructor-for-Rotations.patch
diff --git a/patches/server/0503-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0502-Drop-carried-item-when-player-has-disconnected.patch
index ababb3984c..ababb3984c 100644
--- a/patches/server/0503-Drop-carried-item-when-player-has-disconnected.patch
+++ b/patches/server/0502-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0504-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0503-forced-whitelist-use-configurable-kick-message.patch
index 4ec0ee6b72..96926fac4a 100644
--- a/patches/server/0504-forced-whitelist-use-configurable-kick-message.patch
+++ b/patches/server/0503-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 d38cc3e642eb33759175227fbf86ed250cf0b9f3..e02e57d243bc8bccddcf3e3c40887fb774f5e460 100644
+index 43b28b56c7949f95af5b7e99b04b93ed711d8880..6651afa50cfaf53959f89108904d4bf65a0fc495 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2288,7 +2288,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2286,7 +2286,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/0505-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0504-Don-t-ignore-result-of-PlayerEditBookEvent.patch
index 04bcbb953c..04bcbb953c 100644
--- a/patches/server/0505-Don-t-ignore-result-of-PlayerEditBookEvent.patch
+++ b/patches/server/0504-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0506-Expose-protocol-version.patch b/patches/server/0505-Expose-protocol-version.patch
index 293d2dd336..293d2dd336 100644
--- a/patches/server/0506-Expose-protocol-version.patch
+++ b/patches/server/0505-Expose-protocol-version.patch
diff --git a/patches/server/0507-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0506-Enhance-console-tab-completions-for-brigadier-comman.patch
index 0ec775f4f6..0ec775f4f6 100644
--- a/patches/server/0507-Enhance-console-tab-completions-for-brigadier-comman.patch
+++ b/patches/server/0506-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0508-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0507-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
index a47593aa71..a47593aa71 100644
--- a/patches/server/0508-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
+++ b/patches/server/0507-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0509-Add-bypass-host-check.patch b/patches/server/0508-Add-bypass-host-check.patch
index 53fea6e14d..53fea6e14d 100644
--- a/patches/server/0509-Add-bypass-host-check.patch
+++ b/patches/server/0508-Add-bypass-host-check.patch
diff --git a/patches/server/0510-Set-area-affect-cloud-rotation.patch b/patches/server/0509-Set-area-affect-cloud-rotation.patch
index 1816791836..1816791836 100644
--- a/patches/server/0510-Set-area-affect-cloud-rotation.patch
+++ b/patches/server/0509-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0511-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0510-add-isDeeplySleeping-to-HumanEntity.patch
index eaac6f65d8..eaac6f65d8 100644
--- a/patches/server/0511-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/server/0510-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0512-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0511-add-consumeFuel-to-FurnaceBurnEvent.patch
index 1938dc07ed..1938dc07ed 100644
--- a/patches/server/0512-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/server/0511-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0513-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0512-add-get-set-drop-chance-to-EntityEquipment.patch
index 746b410784..746b410784 100644
--- a/patches/server/0513-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/server/0512-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0514-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0513-fix-PigZombieAngerEvent-cancellation.patch
index 3f0d89aea9..3f0d89aea9 100644
--- a/patches/server/0514-fix-PigZombieAngerEvent-cancellation.patch
+++ b/patches/server/0513-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0515-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0514-fix-PlayerItemHeldEvent-firing-twice.patch
index 9bb8e4f1e1..9bb8e4f1e1 100644
--- a/patches/server/0515-fix-PlayerItemHeldEvent-firing-twice.patch
+++ b/patches/server/0514-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0516-Add-PlayerDeepSleepEvent.patch b/patches/server/0515-Add-PlayerDeepSleepEvent.patch
index c348ba15bc..c348ba15bc 100644
--- a/patches/server/0516-Add-PlayerDeepSleepEvent.patch
+++ b/patches/server/0515-Add-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0517-More-World-API.patch b/patches/server/0516-More-World-API.patch
index acbb18e7df..acbb18e7df 100644
--- a/patches/server/0517-More-World-API.patch
+++ b/patches/server/0516-More-World-API.patch
diff --git a/patches/server/0518-Add-PlayerBedFailEnterEvent.patch b/patches/server/0517-Add-PlayerBedFailEnterEvent.patch
index feffef2aec..feffef2aec 100644
--- a/patches/server/0518-Add-PlayerBedFailEnterEvent.patch
+++ b/patches/server/0517-Add-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0519-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0518-Implement-methods-to-convert-between-Component-and-B.patch
index 614386ecde..614386ecde 100644
--- a/patches/server/0519-Implement-methods-to-convert-between-Component-and-B.patch
+++ b/patches/server/0518-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0520-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/server/0519-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
index 7d836d5307..7d836d5307 100644
--- a/patches/server/0520-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
+++ b/patches/server/0519-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
diff --git a/patches/server/0521-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0520-Introduce-beacon-activation-deactivation-events.patch
index 6d74a805c1..6d74a805c1 100644
--- a/patches/server/0521-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/server/0520-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0522-Add-Channel-initialization-listeners.patch b/patches/server/0521-Add-Channel-initialization-listeners.patch
index 334eb230f0..334eb230f0 100644
--- a/patches/server/0522-Add-Channel-initialization-listeners.patch
+++ b/patches/server/0521-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0523-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0522-Send-empty-commands-if-tab-completion-is-disabled.patch
index daa33fbefc..daa33fbefc 100644
--- a/patches/server/0523-Send-empty-commands-if-tab-completion-is-disabled.patch
+++ b/patches/server/0522-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0524-Add-more-WanderingTrader-API.patch b/patches/server/0523-Add-more-WanderingTrader-API.patch
index 0ce65786dc..0ce65786dc 100644
--- a/patches/server/0524-Add-more-WanderingTrader-API.patch
+++ b/patches/server/0523-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0525-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0524-Add-EntityBlockStorage-clearEntities.patch
index b19812d989..b19812d989 100644
--- a/patches/server/0525-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/server/0524-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0526-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0525-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index c0fd5f11db..c0fd5f11db 100644
--- a/patches/server/0526-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/server/0525-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0527-Add-HiddenPotionEffect-API.patch b/patches/server/0526-Add-HiddenPotionEffect-API.patch
index 2d0b0d5b03..2d0b0d5b03 100644
--- a/patches/server/0527-Add-HiddenPotionEffect-API.patch
+++ b/patches/server/0526-Add-HiddenPotionEffect-API.patch
diff --git a/patches/server/0528-Inventory-close.patch b/patches/server/0527-Inventory-close.patch
index 9ca8b717ab..9ca8b717ab 100644
--- a/patches/server/0528-Inventory-close.patch
+++ b/patches/server/0527-Inventory-close.patch
diff --git a/patches/server/0529-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0528-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index d5f2f9db1f..d5f2f9db1f 100644
--- a/patches/server/0529-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/server/0528-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0530-Add-basic-Datapack-API.patch b/patches/server/0529-Add-basic-Datapack-API.patch
index fbd2c201df..fbd2c201df 100644
--- a/patches/server/0530-Add-basic-Datapack-API.patch
+++ b/patches/server/0529-Add-basic-Datapack-API.patch
diff --git a/patches/server/0531-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0530-Add-environment-variable-to-disable-server-gui.patch
index e4de8ec477..e4de8ec477 100644
--- a/patches/server/0531-Add-environment-variable-to-disable-server-gui.patch
+++ b/patches/server/0530-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0532-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0531-Expand-PlayerGameModeChangeEvent.patch
index 08394e448a..08394e448a 100644
--- a/patches/server/0532-Expand-PlayerGameModeChangeEvent.patch
+++ b/patches/server/0531-Expand-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0533-ItemStack-repair-check-API.patch b/patches/server/0532-ItemStack-repair-check-API.patch
index ab9ccec1cd..ab9ccec1cd 100644
--- a/patches/server/0533-ItemStack-repair-check-API.patch
+++ b/patches/server/0532-ItemStack-repair-check-API.patch
diff --git a/patches/server/0534-More-Enchantment-API.patch b/patches/server/0533-More-Enchantment-API.patch
index a3bf8f8e7e..a3bf8f8e7e 100644
--- a/patches/server/0534-More-Enchantment-API.patch
+++ b/patches/server/0533-More-Enchantment-API.patch
diff --git a/patches/server/0535-Move-range-check-for-block-placing-up.patch b/patches/server/0534-Move-range-check-for-block-placing-up.patch
index 4269998b6e..4269998b6e 100644
--- a/patches/server/0535-Move-range-check-for-block-placing-up.patch
+++ b/patches/server/0534-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0536-Add-Mob-lookAt-API.patch b/patches/server/0535-Add-Mob-lookAt-API.patch
index 3139490a61..3139490a61 100644
--- a/patches/server/0536-Add-Mob-lookAt-API.patch
+++ b/patches/server/0535-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0537-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/0536-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
index 5a8b0c1cb5..5a8b0c1cb5 100644
--- a/patches/server/0537-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
+++ b/patches/server/0536-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
diff --git a/patches/server/0538-Add-Unix-domain-socket-support.patch b/patches/server/0537-Add-Unix-domain-socket-support.patch
index 7c44f07cea..7c44f07cea 100644
--- a/patches/server/0538-Add-Unix-domain-socket-support.patch
+++ b/patches/server/0537-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0539-Add-EntityInsideBlockEvent.patch b/patches/server/0538-Add-EntityInsideBlockEvent.patch
index 0b2938737c..0b2938737c 100644
--- a/patches/server/0539-Add-EntityInsideBlockEvent.patch
+++ b/patches/server/0538-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0540-Improve-item-default-attribute-API.patch b/patches/server/0539-Improve-item-default-attribute-API.patch
index 359537fc19..359537fc19 100644
--- a/patches/server/0540-Improve-item-default-attribute-API.patch
+++ b/patches/server/0539-Improve-item-default-attribute-API.patch
diff --git a/patches/server/0541-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0540-Add-cause-to-Weather-ThunderChangeEvents.patch
index 2807ad861f..2807ad861f 100644
--- a/patches/server/0541-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/server/0540-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0542-More-Lidded-Block-API.patch b/patches/server/0541-More-Lidded-Block-API.patch
index 437434c525..437434c525 100644
--- a/patches/server/0542-More-Lidded-Block-API.patch
+++ b/patches/server/0541-More-Lidded-Block-API.patch
diff --git a/patches/server/0543-Limit-item-frame-cursors-on-maps.patch b/patches/server/0542-Limit-item-frame-cursors-on-maps.patch
index d710b59685..d710b59685 100644
--- a/patches/server/0543-Limit-item-frame-cursors-on-maps.patch
+++ b/patches/server/0542-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0544-Add-PlayerKickEvent-causes.patch b/patches/server/0543-Add-PlayerKickEvent-causes.patch
index f970c99ba4..73de4f305a 100644
--- a/patches/server/0544-Add-PlayerKickEvent-causes.patch
+++ b/patches/server/0543-Add-PlayerKickEvent-causes.patch
@@ -43,10 +43,10 @@ index dbcf183483766f39334d7f7e8336033906625f3f..300929a406905f5ff1ede664d5b99fb0
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e02e57d243bc8bccddcf3e3c40887fb774f5e460..6ad7c34513034c87059f8a0790aea3231dd0d2a9 100644
+index 6651afa50cfaf53959f89108904d4bf65a0fc495..56589fee8dd09783e01f2ae290ffacb5dff3f05f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2288,7 +2288,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2286,7 +2286,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/0545-Add-PufferFishStateChangeEvent.patch b/patches/server/0544-Add-PufferFishStateChangeEvent.patch
index 87e61bb2a3..87e61bb2a3 100644
--- a/patches/server/0545-Add-PufferFishStateChangeEvent.patch
+++ b/patches/server/0544-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0546-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0545-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
index 12c519eefe..12c519eefe 100644
--- a/patches/server/0546-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
+++ b/patches/server/0545-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0547-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0546-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
index 04a6d787b6..04a6d787b6 100644
--- a/patches/server/0547-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
+++ b/patches/server/0546-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0548-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0547-Add-option-to-fix-items-merging-through-walls.patch
index 636797089d..ba1a219b49 100644
--- a/patches/server/0548-Add-option-to-fix-items-merging-through-walls.patch
+++ b/patches/server/0547-Add-option-to-fix-items-merging-through-walls.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to fix items merging through walls
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 2e550c7db6cebc941590c35337fd47416407a5aa..5448a0f54080ac02bc4ce8ad5645173b67841e1a 100644
+index c724359995d65c88e7f365eea55f3e4382a46ddd..df90d5b934f41f5d8c232e93830d6690b6ccf401 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -284,6 +284,14 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -282,6 +282,14 @@ public class ItemEntity extends Entity implements TraceableEntity {
                  ItemEntity entityitem = (ItemEntity) iterator.next();
  
                  if (entityitem.isMergable()) {
diff --git a/patches/server/0549-Add-BellRevealRaiderEvent.patch b/patches/server/0548-Add-BellRevealRaiderEvent.patch
index 871aa2a198..871aa2a198 100644
--- a/patches/server/0549-Add-BellRevealRaiderEvent.patch
+++ b/patches/server/0548-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0550-Fix-invulnerable-end-crystals.patch b/patches/server/0549-Fix-invulnerable-end-crystals.patch
index 57cba19656..57cba19656 100644
--- a/patches/server/0550-Fix-invulnerable-end-crystals.patch
+++ b/patches/server/0549-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0551-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0550-Add-ElderGuardianAppearanceEvent.patch
index d9bc14356d..d9bc14356d 100644
--- a/patches/server/0551-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/server/0550-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0552-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0551-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
index 3d03f4c4d2..3d03f4c4d2 100644
--- a/patches/server/0552-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
+++ b/patches/server/0551-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0553-Line-Of-Sight-Changes.patch b/patches/server/0552-Line-Of-Sight-Changes.patch
index d2ab96a4d9..d2ab96a4d9 100644
--- a/patches/server/0553-Line-Of-Sight-Changes.patch
+++ b/patches/server/0552-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0554-add-per-world-spawn-limits.patch b/patches/server/0553-add-per-world-spawn-limits.patch
index 2af34cd439..2af34cd439 100644
--- a/patches/server/0554-add-per-world-spawn-limits.patch
+++ b/patches/server/0553-add-per-world-spawn-limits.patch
diff --git a/patches/server/0555-Fix-potions-splash-events.patch b/patches/server/0554-Fix-potions-splash-events.patch
index 38cfaf9769..38cfaf9769 100644
--- a/patches/server/0555-Fix-potions-splash-events.patch
+++ b/patches/server/0554-Fix-potions-splash-events.patch
diff --git a/patches/server/0556-Add-more-LimitedRegion-API.patch b/patches/server/0555-Add-more-LimitedRegion-API.patch
index 6e183e954e..6e183e954e 100644
--- a/patches/server/0556-Add-more-LimitedRegion-API.patch
+++ b/patches/server/0555-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0557-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0556-Fix-PlayerDropItemEvent-using-wrong-item.patch
index 8f8228a1d4..8f8228a1d4 100644
--- a/patches/server/0557-Fix-PlayerDropItemEvent-using-wrong-item.patch
+++ b/patches/server/0556-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0558-Missing-Entity-API.patch b/patches/server/0557-Missing-Entity-API.patch
index 14e5128e24..14e5128e24 100644
--- a/patches/server/0558-Missing-Entity-API.patch
+++ b/patches/server/0557-Missing-Entity-API.patch
diff --git a/patches/server/0559-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0558-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
index a5c4eefb9a..a5c4eefb9a 100644
--- a/patches/server/0559-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
+++ b/patches/server/0558-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0560-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0559-Use-getChunkIfLoadedImmediately-in-places.patch
index b2446b7c2b..b2446b7c2b 100644
--- a/patches/server/0560-Use-getChunkIfLoadedImmediately-in-places.patch
+++ b/patches/server/0559-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0561-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0560-Fix-commands-from-signs-not-firing-command-events.patch
index b86e341359..b86e341359 100644
--- a/patches/server/0561-Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/0560-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0562-Add-PlayerArmSwingEvent.patch b/patches/server/0561-Add-PlayerArmSwingEvent.patch
index 8e77eadc23..8e77eadc23 100644
--- a/patches/server/0562-Add-PlayerArmSwingEvent.patch
+++ b/patches/server/0561-Add-PlayerArmSwingEvent.patch
diff --git a/patches/server/0563-Fix-kick-event-leave-message-not-being-sent.patch b/patches/server/0562-Fix-kick-event-leave-message-not-being-sent.patch
index 461885e49a..461885e49a 100644
--- a/patches/server/0563-Fix-kick-event-leave-message-not-being-sent.patch
+++ b/patches/server/0562-Fix-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0564-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0563-Don-t-apply-cramming-damage-to-players.patch
index f23c0c584f..f23c0c584f 100644
--- a/patches/server/0564-Don-t-apply-cramming-damage-to-players.patch
+++ b/patches/server/0563-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0565-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0564-Rate-options-and-timings-for-sensors-and-behaviors.patch
index d74af14524..d74af14524 100644
--- a/patches/server/0565-Rate-options-and-timings-for-sensors-and-behaviors.patch
+++ b/patches/server/0564-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0566-Add-missing-forceDrop-toggles.patch b/patches/server/0565-Add-missing-forceDrop-toggles.patch
index e11380293a..e11380293a 100644
--- a/patches/server/0566-Add-missing-forceDrop-toggles.patch
+++ b/patches/server/0565-Add-missing-forceDrop-toggles.patch
diff --git a/patches/server/0567-Stinger-API.patch b/patches/server/0566-Stinger-API.patch
index 0ace28bb68..0ace28bb68 100644
--- a/patches/server/0567-Stinger-API.patch
+++ b/patches/server/0566-Stinger-API.patch
diff --git a/patches/server/0568-Add-System.out-err-catcher.patch b/patches/server/0567-Add-System.out-err-catcher.patch
index 139b410ef1..139b410ef1 100644
--- a/patches/server/0568-Add-System.out-err-catcher.patch
+++ b/patches/server/0567-Add-System.out-err-catcher.patch
diff --git a/patches/server/0569-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0568-Prevent-AFK-kick-while-watching-end-credits.patch
index 42e8c37d20..42e8c37d20 100644
--- a/patches/server/0569-Prevent-AFK-kick-while-watching-end-credits.patch
+++ b/patches/server/0568-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0570-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0569-Allow-skipping-writing-of-comments-to-server.propert.patch
index 1fce522892..1fce522892 100644
--- a/patches/server/0570-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0569-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0571-Add-PlayerSetSpawnEvent.patch b/patches/server/0570-Add-PlayerSetSpawnEvent.patch
index 28e265e406..28e265e406 100644
--- a/patches/server/0571-Add-PlayerSetSpawnEvent.patch
+++ b/patches/server/0570-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0572-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0571-Make-hoppers-respect-inventory-max-stack-size.patch
index c5b4e66926..c5b4e66926 100644
--- a/patches/server/0572-Make-hoppers-respect-inventory-max-stack-size.patch
+++ b/patches/server/0571-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0573-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0572-Optimize-entity-tracker-passenger-checks.patch
index 0dd7d25ba3..0dd7d25ba3 100644
--- a/patches/server/0573-Optimize-entity-tracker-passenger-checks.patch
+++ b/patches/server/0572-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0574-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0573-Config-option-for-Piglins-guarding-chests.patch
index 8e2094a53d..8e2094a53d 100644
--- a/patches/server/0574-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0573-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0575-Add-EntityDamageItemEvent.patch b/patches/server/0574-Add-EntityDamageItemEvent.patch
index 1adcd93580..1adcd93580 100644
--- a/patches/server/0575-Add-EntityDamageItemEvent.patch
+++ b/patches/server/0574-Add-EntityDamageItemEvent.patch
diff --git a/patches/server/0576-Optimize-indirect-passenger-iteration.patch b/patches/server/0575-Optimize-indirect-passenger-iteration.patch
index dc1758edec..dc1758edec 100644
--- a/patches/server/0576-Optimize-indirect-passenger-iteration.patch
+++ b/patches/server/0575-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0577-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0576-Configurable-item-frame-map-cursor-update-interval.patch
index a6389cdcbb..a6389cdcbb 100644
--- a/patches/server/0577-Configurable-item-frame-map-cursor-update-interval.patch
+++ b/patches/server/0576-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0578-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0577-Change-EnderEye-target-without-changing-other-things.patch
index 53d06a36ec..53d06a36ec 100644
--- a/patches/server/0578-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/server/0577-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0579-Add-BlockBreakBlockEvent.patch b/patches/server/0578-Add-BlockBreakBlockEvent.patch
index 4bc0c5116f..4bc0c5116f 100644
--- a/patches/server/0579-Add-BlockBreakBlockEvent.patch
+++ b/patches/server/0578-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0580-Option-to-prevent-data-components-copy-in-smithing-r.patch b/patches/server/0579-Option-to-prevent-data-components-copy-in-smithing-r.patch
index 7246d24edd..7246d24edd 100644
--- a/patches/server/0580-Option-to-prevent-data-components-copy-in-smithing-r.patch
+++ b/patches/server/0579-Option-to-prevent-data-components-copy-in-smithing-r.patch
diff --git a/patches/server/0581-More-CommandBlock-API.patch b/patches/server/0580-More-CommandBlock-API.patch
index 16cf3ee3d7..16cf3ee3d7 100644
--- a/patches/server/0581-More-CommandBlock-API.patch
+++ b/patches/server/0580-More-CommandBlock-API.patch
diff --git a/patches/server/0582-Add-missing-team-sidebar-display-slots.patch b/patches/server/0581-Add-missing-team-sidebar-display-slots.patch
index 3b0dfacf08..3b0dfacf08 100644
--- a/patches/server/0582-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/server/0581-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0583-Add-back-EntityPortalExitEvent.patch b/patches/server/0582-Add-back-EntityPortalExitEvent.patch
index fcaf6caca5..fcaf6caca5 100644
--- a/patches/server/0583-Add-back-EntityPortalExitEvent.patch
+++ b/patches/server/0582-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0584-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0583-Add-methods-to-find-targets-for-lightning-strikes.patch
index ca096b9dd9..ca096b9dd9 100644
--- a/patches/server/0584-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/server/0583-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0585-Get-entity-default-attributes.patch b/patches/server/0584-Get-entity-default-attributes.patch
index 0364d2381c..0364d2381c 100644
--- a/patches/server/0585-Get-entity-default-attributes.patch
+++ b/patches/server/0584-Get-entity-default-attributes.patch
diff --git a/patches/server/0586-Left-handed-API.patch b/patches/server/0585-Left-handed-API.patch
index 643df451a4..643df451a4 100644
--- a/patches/server/0586-Left-handed-API.patch
+++ b/patches/server/0585-Left-handed-API.patch
diff --git a/patches/server/0587-Add-more-advancement-API.patch b/patches/server/0586-Add-more-advancement-API.patch
index ed610abf5d..ed610abf5d 100644
--- a/patches/server/0587-Add-more-advancement-API.patch
+++ b/patches/server/0586-Add-more-advancement-API.patch
diff --git a/patches/server/0588-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0587-Add-ItemFactory-getSpawnEgg-API.patch
index c4fffcd5cc..c4fffcd5cc 100644
--- a/patches/server/0588-Add-ItemFactory-getSpawnEgg-API.patch
+++ b/patches/server/0587-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0589-Add-critical-damage-API.patch b/patches/server/0588-Add-critical-damage-API.patch
index 554a8471d9..554a8471d9 100644
--- a/patches/server/0589-Add-critical-damage-API.patch
+++ b/patches/server/0588-Add-critical-damage-API.patch
diff --git a/patches/server/0590-Fix-issues-with-mob-conversion.patch b/patches/server/0589-Fix-issues-with-mob-conversion.patch
index 1b4597fe00..1b4597fe00 100644
--- a/patches/server/0590-Fix-issues-with-mob-conversion.patch
+++ b/patches/server/0589-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0591-Add-hasCollision-methods-to-various-places.patch b/patches/server/0590-Add-hasCollision-methods-to-various-places.patch
index 1acc4729a7..1acc4729a7 100644
--- a/patches/server/0591-Add-hasCollision-methods-to-various-places.patch
+++ b/patches/server/0590-Add-hasCollision-methods-to-various-places.patch
diff --git a/patches/server/0592-Goat-ram-API.patch b/patches/server/0591-Goat-ram-API.patch
index 2f5ccdfed4..2f5ccdfed4 100644
--- a/patches/server/0592-Goat-ram-API.patch
+++ b/patches/server/0591-Goat-ram-API.patch
diff --git a/patches/server/0593-Add-API-for-resetting-a-single-score.patch b/patches/server/0592-Add-API-for-resetting-a-single-score.patch
index b9dd1c2be3..b9dd1c2be3 100644
--- a/patches/server/0593-Add-API-for-resetting-a-single-score.patch
+++ b/patches/server/0592-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0594-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0593-Add-Raw-Byte-Entity-Serialization.patch
index 3ad09b5cc5..3ad09b5cc5 100644
--- a/patches/server/0594-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0593-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/server/0595-Vanilla-command-permission-fixes.patch b/patches/server/0594-Vanilla-command-permission-fixes.patch
index a9f23f8a53..a9f23f8a53 100644
--- a/patches/server/0595-Vanilla-command-permission-fixes.patch
+++ b/patches/server/0594-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0596-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0595-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
index 22f86aa476..22f86aa476 100644
--- a/patches/server/0596-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
+++ b/patches/server/0595-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0597-Fix-GameProfileCache-concurrency.patch b/patches/server/0596-Fix-GameProfileCache-concurrency.patch
index 6cb7e5235f..6cb7e5235f 100644
--- a/patches/server/0597-Fix-GameProfileCache-concurrency.patch
+++ b/patches/server/0596-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0598-Improve-and-expand-AsyncCatcher.patch b/patches/server/0597-Improve-and-expand-AsyncCatcher.patch
index 08143bc4aa..08143bc4aa 100644
--- a/patches/server/0598-Improve-and-expand-AsyncCatcher.patch
+++ b/patches/server/0597-Improve-and-expand-AsyncCatcher.patch
diff --git a/patches/server/0599-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0598-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 10f4a156d9..10f4a156d9 100644
--- a/patches/server/0599-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0598-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0600-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0599-Sanitize-ResourceLocation-error-logging.patch
index 602f0d3b27..602f0d3b27 100644
--- a/patches/server/0600-Sanitize-ResourceLocation-error-logging.patch
+++ b/patches/server/0599-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0601-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0600-Manually-inline-methods-in-BlockPosition.patch
index 77b9a47ac1..77b9a47ac1 100644
--- a/patches/server/0601-Manually-inline-methods-in-BlockPosition.patch
+++ b/patches/server/0600-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0602-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0601-Name-craft-scheduler-threads-according-to-the-plugin.patch
index 30f250f235..30f250f235 100644
--- a/patches/server/0602-Name-craft-scheduler-threads-according-to-the-plugin.patch
+++ b/patches/server/0601-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0603-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0602-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
index 23f6d7b245..23f6d7b245 100644
--- a/patches/server/0603-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
+++ b/patches/server/0602-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0604-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0603-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
index 48449be461..48449be461 100644
--- a/patches/server/0604-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
+++ b/patches/server/0603-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0605-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/server/0604-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
index 0ab3e48f48..0ab3e48f48 100644
--- a/patches/server/0605-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
+++ b/patches/server/0604-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
diff --git a/patches/server/0606-Time-scoreboard-search.patch b/patches/server/0605-Time-scoreboard-search.patch
index 8d15084758..8d15084758 100644
--- a/patches/server/0606-Time-scoreboard-search.patch
+++ b/patches/server/0605-Time-scoreboard-search.patch
diff --git a/patches/server/0607-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0606-Oprimise-map-impl-for-tracked-players.patch
index dcfacfefe7..dcfacfefe7 100644
--- a/patches/server/0607-Oprimise-map-impl-for-tracked-players.patch
+++ b/patches/server/0606-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0608-Add-missing-InventoryType.patch b/patches/server/0607-Add-missing-InventoryType.patch
index a49bdf073d..a49bdf073d 100644
--- a/patches/server/0608-Add-missing-InventoryType.patch
+++ b/patches/server/0607-Add-missing-InventoryType.patch
diff --git a/patches/server/0609-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0608-Optimise-BlockSoil-nearby-water-lookup.patch
index 81b199a243..81b199a243 100644
--- a/patches/server/0609-Optimise-BlockSoil-nearby-water-lookup.patch
+++ b/patches/server/0608-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0610-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0609-Fix-merchant-inventory-not-closing-on-entity-removal.patch
index 2cd406fbc0..2cd406fbc0 100644
--- a/patches/server/0610-Fix-merchant-inventory-not-closing-on-entity-removal.patch
+++ b/patches/server/0609-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0611-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0610-Check-requirement-before-suggesting-root-nodes.patch
index fce5e326f9..fce5e326f9 100644
--- a/patches/server/0611-Check-requirement-before-suggesting-root-nodes.patch
+++ b/patches/server/0610-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0612-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0611-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
index 39f096a88d..39f096a88d 100644
--- a/patches/server/0612-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
+++ b/patches/server/0611-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0613-Add-packet-limiter-config.patch b/patches/server/0612-Add-packet-limiter-config.patch
index a6bd6521f4..a6bd6521f4 100644
--- a/patches/server/0613-Add-packet-limiter-config.patch
+++ b/patches/server/0612-Add-packet-limiter-config.patch
diff --git a/patches/server/0614-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0613-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
index 0b139a1e02..0b139a1e02 100644
--- a/patches/server/0614-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
+++ b/patches/server/0613-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0615-Ensure-valid-vehicle-status.patch b/patches/server/0614-Ensure-valid-vehicle-status.patch
index f8ce44340d..f8ce44340d 100644
--- a/patches/server/0615-Ensure-valid-vehicle-status.patch
+++ b/patches/server/0614-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0616-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0615-Prevent-softlocked-end-exit-portal-generation.patch
index 9e8d9491cb..9e8d9491cb 100644
--- a/patches/server/0616-Prevent-softlocked-end-exit-portal-generation.patch
+++ b/patches/server/0615-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0617-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0616-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
index 4fac0c1ab3..4fac0c1ab3 100644
--- a/patches/server/0617-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
+++ b/patches/server/0616-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0618-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0617-Don-t-log-debug-logging-being-disabled.patch
index 8e733b1cea..8e733b1cea 100644
--- a/patches/server/0618-Don-t-log-debug-logging-being-disabled.patch
+++ b/patches/server/0617-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0619-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0618-fix-various-menus-with-empty-level-accesses.patch
index efe5d1ddce..efe5d1ddce 100644
--- a/patches/server/0619-fix-various-menus-with-empty-level-accesses.patch
+++ b/patches/server/0618-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0620-Preserve-overstacked-loot.patch b/patches/server/0619-Preserve-overstacked-loot.patch
index bd657ec906..bd657ec906 100644
--- a/patches/server/0620-Preserve-overstacked-loot.patch
+++ b/patches/server/0619-Preserve-overstacked-loot.patch
diff --git a/patches/server/0621-Update-head-rotation-in-missing-places.patch b/patches/server/0620-Update-head-rotation-in-missing-places.patch
index a1c7566dc6..a1c7566dc6 100644
--- a/patches/server/0621-Update-head-rotation-in-missing-places.patch
+++ b/patches/server/0620-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0622-prevent-unintended-light-block-manipulation.patch b/patches/server/0621-prevent-unintended-light-block-manipulation.patch
index bff44792dc..bff44792dc 100644
--- a/patches/server/0622-prevent-unintended-light-block-manipulation.patch
+++ b/patches/server/0621-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0623-Fix-CraftCriteria-defaults-map.patch b/patches/server/0622-Fix-CraftCriteria-defaults-map.patch
index 3e79bd7fb7..3e79bd7fb7 100644
--- a/patches/server/0623-Fix-CraftCriteria-defaults-map.patch
+++ b/patches/server/0622-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0624-Fix-upstreams-block-state-factories.patch b/patches/server/0623-Fix-upstreams-block-state-factories.patch
index 737645669d..737645669d 100644
--- a/patches/server/0624-Fix-upstreams-block-state-factories.patch
+++ b/patches/server/0623-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0625-Configurable-feature-seeds.patch b/patches/server/0624-Configurable-feature-seeds.patch
index 27997ba7c0..27997ba7c0 100644
--- a/patches/server/0625-Configurable-feature-seeds.patch
+++ b/patches/server/0624-Configurable-feature-seeds.patch
diff --git a/patches/server/0626-Add-root-admin-user-detection.patch b/patches/server/0625-Add-root-admin-user-detection.patch
index abe2f3b5ae..abe2f3b5ae 100644
--- a/patches/server/0626-Add-root-admin-user-detection.patch
+++ b/patches/server/0625-Add-root-admin-user-detection.patch
diff --git a/patches/server/0627-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0626-don-t-attempt-to-teleport-dead-entities.patch
index 2c5a22066f..2c5a22066f 100644
--- a/patches/server/0627-don-t-attempt-to-teleport-dead-entities.patch
+++ b/patches/server/0626-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0628-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0627-Prevent-excessive-velocity-through-repeated-crits.patch
index 10ce91923a..10ce91923a 100644
--- a/patches/server/0628-Prevent-excessive-velocity-through-repeated-crits.patch
+++ b/patches/server/0627-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0629-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0628-Remove-client-side-code-using-deprecated-for-removal.patch
index 4aed4f1f3a..4aed4f1f3a 100644
--- a/patches/server/0629-Remove-client-side-code-using-deprecated-for-removal.patch
+++ b/patches/server/0628-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0630-Fix-Spigot-growth-modifiers.patch b/patches/server/0629-Fix-Spigot-growth-modifiers.patch
index 35160b163d..35160b163d 100644
--- a/patches/server/0630-Fix-Spigot-growth-modifiers.patch
+++ b/patches/server/0629-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0631-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0630-Prevent-ContainerOpenersCounter-openCount-from-going.patch
index b017de75d1..b017de75d1 100644
--- a/patches/server/0631-Prevent-ContainerOpenersCounter-openCount-from-going.patch
+++ b/patches/server/0630-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0632-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0631-Add-PlayerItemFrameChangeEvent.patch
index e047726740..e047726740 100644
--- a/patches/server/0632-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/server/0631-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0633-Optimize-HashMapPalette.patch b/patches/server/0632-Optimize-HashMapPalette.patch
index d50159b901..d50159b901 100644
--- a/patches/server/0633-Optimize-HashMapPalette.patch
+++ b/patches/server/0632-Optimize-HashMapPalette.patch
diff --git a/patches/server/0634-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0633-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
index 8f7f6be080..8f7f6be080 100644
--- a/patches/server/0634-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
+++ b/patches/server/0633-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0635-Add-more-Campfire-API.patch b/patches/server/0634-Add-more-Campfire-API.patch
index 012ca1cc7d..012ca1cc7d 100644
--- a/patches/server/0635-Add-more-Campfire-API.patch
+++ b/patches/server/0634-Add-more-Campfire-API.patch
diff --git a/patches/server/0636-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0635-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
index 80c053acc6..80c053acc6 100644
--- a/patches/server/0636-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
+++ b/patches/server/0635-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0637-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0636-Forward-CraftEntity-in-teleport-command.patch
index 8e2568f110..8e2568f110 100644
--- a/patches/server/0637-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0636-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0638-Improve-scoreboard-entries.patch b/patches/server/0637-Improve-scoreboard-entries.patch
index 8acac86ce3..8acac86ce3 100644
--- a/patches/server/0638-Improve-scoreboard-entries.patch
+++ b/patches/server/0637-Improve-scoreboard-entries.patch
diff --git a/patches/server/0639-Entity-powdered-snow-API.patch b/patches/server/0638-Entity-powdered-snow-API.patch
index 8cba17f571..8cba17f571 100644
--- a/patches/server/0639-Entity-powdered-snow-API.patch
+++ b/patches/server/0638-Entity-powdered-snow-API.patch
diff --git a/patches/server/0640-Add-API-for-item-entity-health.patch b/patches/server/0639-Add-API-for-item-entity-health.patch
index cd2757b544..cd2757b544 100644
--- a/patches/server/0640-Add-API-for-item-entity-health.patch
+++ b/patches/server/0639-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0641-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0640-Configurable-max-block-light-for-monster-spawning.patch
index d0fb0003dc..d0fb0003dc 100644
--- a/patches/server/0641-Configurable-max-block-light-for-monster-spawning.patch
+++ b/patches/server/0640-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0642-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0641-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
index 2ee001a77a..2ee001a77a 100644
--- a/patches/server/0642-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
+++ b/patches/server/0641-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0643-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0642-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index 026f793541..026f793541 100644
--- a/patches/server/0643-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/server/0642-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0644-Bucketable-API.patch b/patches/server/0643-Bucketable-API.patch
index 274ccde059..274ccde059 100644
--- a/patches/server/0644-Bucketable-API.patch
+++ b/patches/server/0643-Bucketable-API.patch
diff --git a/patches/server/0645-Validate-usernames.patch b/patches/server/0644-Validate-usernames.patch
index 0735bfd857..0735bfd857 100644
--- a/patches/server/0645-Validate-usernames.patch
+++ b/patches/server/0644-Validate-usernames.patch
diff --git a/patches/server/0646-Make-water-animal-spawn-height-configurable.patch b/patches/server/0645-Make-water-animal-spawn-height-configurable.patch
index 14f75d9b89..14f75d9b89 100644
--- a/patches/server/0646-Make-water-animal-spawn-height-configurable.patch
+++ b/patches/server/0645-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0647-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0646-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 2fa8cd46e9..4fa91f877c 100644
--- a/patches/server/0647-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0646-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 6ad7c34513034c87059f8a0790aea3231dd0d2a9..188b1844ca6ee5a97f7a588121255417a184a4df 100644
+index 56589fee8dd09783e01f2ae290ffacb5dff3f05f..718b653a118a1c64d07efab93192f10dfcbf414e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -612,7 +612,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -611,7 +611,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/0648-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0647-Add-config-option-for-worlds-affected-by-time-cmd.patch
index 156eacada9..156eacada9 100644
--- a/patches/server/0648-Add-config-option-for-worlds-affected-by-time-cmd.patch
+++ b/patches/server/0647-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0649-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0648-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
index be0eedab93..be0eedab93 100644
--- a/patches/server/0649-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
+++ b/patches/server/0648-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
diff --git a/patches/server/0650-Multiple-Entries-with-Scoreboards.patch b/patches/server/0649-Multiple-Entries-with-Scoreboards.patch
index c286ca9e4b..c286ca9e4b 100644
--- a/patches/server/0650-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/server/0649-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0651-Reset-placed-block-on-exception.patch b/patches/server/0650-Reset-placed-block-on-exception.patch
index c5b6f9f135..c5b6f9f135 100644
--- a/patches/server/0651-Reset-placed-block-on-exception.patch
+++ b/patches/server/0650-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0652-Add-configurable-height-for-slime-spawn.patch b/patches/server/0651-Add-configurable-height-for-slime-spawn.patch
index 5ed7f1549d..5ed7f1549d 100644
--- a/patches/server/0652-Add-configurable-height-for-slime-spawn.patch
+++ b/patches/server/0651-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0653-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0652-Fix-xp-reward-for-baby-zombies.patch
index a4fec4e0f2..a4fec4e0f2 100644
--- a/patches/server/0653-Fix-xp-reward-for-baby-zombies.patch
+++ b/patches/server/0652-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0654-Multi-Block-Change-API-Implementation.patch b/patches/server/0653-Multi-Block-Change-API-Implementation.patch
index 740aad5839..740aad5839 100644
--- a/patches/server/0654-Multi-Block-Change-API-Implementation.patch
+++ b/patches/server/0653-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0655-Fix-NotePlayEvent.patch b/patches/server/0654-Fix-NotePlayEvent.patch
index 4a601d8f1b..4a601d8f1b 100644
--- a/patches/server/0655-Fix-NotePlayEvent.patch
+++ b/patches/server/0654-Fix-NotePlayEvent.patch
diff --git a/patches/server/0656-Freeze-Tick-Lock-API.patch b/patches/server/0655-Freeze-Tick-Lock-API.patch
index 69adb442ee..69adb442ee 100644
--- a/patches/server/0656-Freeze-Tick-Lock-API.patch
+++ b/patches/server/0655-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0657-More-PotionEffectType-API.patch b/patches/server/0656-More-PotionEffectType-API.patch
index 1bbb96d291..1bbb96d291 100644
--- a/patches/server/0657-More-PotionEffectType-API.patch
+++ b/patches/server/0656-More-PotionEffectType-API.patch
diff --git a/patches/server/0658-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0657-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
index 82d25835a6..82d25835a6 100644
--- a/patches/server/0658-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
+++ b/patches/server/0657-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0659-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0658-API-for-creating-command-sender-which-forwards-feedb.patch
index d6e2e12cf1..d6e2e12cf1 100644
--- a/patches/server/0659-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0658-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0660-Add-missing-structure-set-seed-configs.patch b/patches/server/0659-Add-missing-structure-set-seed-configs.patch
index 12c137b53e..12c137b53e 100644
--- a/patches/server/0660-Add-missing-structure-set-seed-configs.patch
+++ b/patches/server/0659-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0661-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0660-Fix-cancelled-powdered-snow-bucket-placement.patch
index 6a3d835ae7..08a9dbf2e4 100644
--- a/patches/server/0661-Fix-cancelled-powdered-snow-bucket-placement.patch
+++ b/patches/server/0660-Fix-cancelled-powdered-snow-bucket-placement.patch
@@ -8,7 +8,7 @@ snow bucket didn't revert grass that became snowy because of the
 placement.
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 7daecce161b4853a84520010d430600d9a7a903b..1cfd41f36724f0c54489ad7c1c41486e45467a23 100644
+index ad1cb11245108b5cb187b686ed7e6bc769193b52..ec3be7fb4eb4560fe0106ac127f17d7437612157 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -422,7 +422,7 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0662-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0661-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 23ebb6f9c1..23ebb6f9c1 100644
--- a/patches/server/0662-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0661-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0663-Add-GameEvent-tags.patch b/patches/server/0662-Add-GameEvent-tags.patch
index 46706c99d7..46706c99d7 100644
--- a/patches/server/0663-Add-GameEvent-tags.patch
+++ b/patches/server/0662-Add-GameEvent-tags.patch
diff --git a/patches/server/0664-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0663-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
index b22ddd6951..f73960e08f 100644
--- a/patches/server/0664-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
+++ b/patches/server/0663-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 188b1844ca6ee5a97f7a588121255417a184a4df..ca6be44c6b2d0176ea41b1735106c5af7cf9f868 100644
+index 718b653a118a1c64d07efab93192f10dfcbf414e..d45f234fe389ade739bb13f824a1f650709220b8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1371,6 +1371,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1369,6 +1369,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          if (super.pollTask()) {
              return true;
          } else {
@@ -20,7 +20,7 @@ index 188b1844ca6ee5a97f7a588121255417a184a4df..ca6be44c6b2d0176ea41b1735106c5af
              if (this.tickRateManager.isSprinting() || this.haveTime()) {
                  Iterator iterator = this.getAllLevels().iterator();
  
-@@ -1378,12 +1379,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1376,12 +1377,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      ServerLevel worldserver = (ServerLevel) iterator.next();
  
                      if (worldserver.getChunkSource().pollTask()) {
diff --git a/patches/server/0665-Furnace-RecipesUsed-API.patch b/patches/server/0664-Furnace-RecipesUsed-API.patch
index d8224fe839..d8224fe839 100644
--- a/patches/server/0665-Furnace-RecipesUsed-API.patch
+++ b/patches/server/0664-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0666-Configurable-sculk-sensor-listener-range.patch b/patches/server/0665-Configurable-sculk-sensor-listener-range.patch
index 99ff902efa..99ff902efa 100644
--- a/patches/server/0666-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/server/0665-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0667-Add-missing-block-data-API.patch b/patches/server/0666-Add-missing-block-data-API.patch
index ace8c632a6..ace8c632a6 100644
--- a/patches/server/0667-Add-missing-block-data-API.patch
+++ b/patches/server/0666-Add-missing-block-data-API.patch
diff --git a/patches/server/0668-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0667-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 3d41fa27d1..9093bae5b5 100644
--- a/patches/server/0668-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0667-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 ca6be44c6b2d0176ea41b1735106c5af7cf9f868..aa1fbbe55e3dc8fd6bbf021806c66686f8de3d9a 100644
+index d45f234fe389ade739bb13f824a1f650709220b8..413a37991d1df6314dd9938e5eb5f28f5b69efb8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -632,7 +632,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -631,7 +631,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  this.commandStorage = new CommandStorage(worldpersistentdata);
              } else {
                  ChunkProgressListener worldloadlistener = this.progressListenerFactory.create(this.worldData.getGameRules().getInt(GameRules.RULE_SPAWN_CHUNK_RADIUS));
diff --git a/patches/server/0669-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0668-Put-world-into-worldlist-before-initing-the-world.patch
index aedcd94778..f75024e70e 100644
--- a/patches/server/0669-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0668-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 aa1fbbe55e3dc8fd6bbf021806c66686f8de3d9a..04286e907ff14cc8c45dbfc6ab12f520afcca2ca 100644
+index 413a37991d1df6314dd9938e5eb5f28f5b69efb8..e7d6f4e6ac41b183c702d5195e4f94136c22b000 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -644,9 +644,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -643,9 +643,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              }
  
              worlddata.setModdedInfo(this.getServerModName(), this.getModdedStatus().shouldReportAsModified());
diff --git a/patches/server/0670-Custom-Potion-Mixes.patch b/patches/server/0669-Custom-Potion-Mixes.patch
index 81f15e071c..c86c2a255c 100644
--- a/patches/server/0670-Custom-Potion-Mixes.patch
+++ b/patches/server/0669-Custom-Potion-Mixes.patch
@@ -96,10 +96,10 @@ index 0000000000000000000000000000000000000000..7ea357ac2f3a93db4ebdf24b5072be7d
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 04286e907ff14cc8c45dbfc6ab12f520afcca2ca..8142e4a238066404f3d1685f9cee1a2b91cdd371 100644
+index e7d6f4e6ac41b183c702d5195e4f94136c22b000..94aa901b77b19445a33d5b2b24ba2e947d2a6aef 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2160,6 +2160,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2158,6 +2158,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
              this.worldData.setDataConfiguration(worlddataconfiguration);
              this.resources.managers.updateRegistryTags();
diff --git a/patches/server/0671-Force-close-world-loading-screen.patch b/patches/server/0670-Force-close-world-loading-screen.patch
index 284d512115..284d512115 100644
--- a/patches/server/0671-Force-close-world-loading-screen.patch
+++ b/patches/server/0670-Force-close-world-loading-screen.patch
diff --git a/patches/server/0672-Fix-falling-block-spawn-methods.patch b/patches/server/0671-Fix-falling-block-spawn-methods.patch
index 978a204209..978a204209 100644
--- a/patches/server/0672-Fix-falling-block-spawn-methods.patch
+++ b/patches/server/0671-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0673-Expose-furnace-minecart-push-values.patch b/patches/server/0672-Expose-furnace-minecart-push-values.patch
index 6245e14b4e..6245e14b4e 100644
--- a/patches/server/0673-Expose-furnace-minecart-push-values.patch
+++ b/patches/server/0672-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0674-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0673-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
index 4698298019..4698298019 100644
--- a/patches/server/0674-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
+++ b/patches/server/0673-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0675-More-Projectile-API.patch b/patches/server/0674-More-Projectile-API.patch
index 120c102c71..120c102c71 100644
--- a/patches/server/0675-More-Projectile-API.patch
+++ b/patches/server/0674-More-Projectile-API.patch
diff --git a/patches/server/0676-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0675-Fix-swamp-hut-cat-generation-deadlock.patch
index 6aa68bdd5c..6aa68bdd5c 100644
--- a/patches/server/0676-Fix-swamp-hut-cat-generation-deadlock.patch
+++ b/patches/server/0675-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0677-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0676-Don-t-allow-vehicle-movement-from-players-while-tele.patch
index 0ceb6b0ce1..0ceb6b0ce1 100644
--- a/patches/server/0677-Don-t-allow-vehicle-movement-from-players-while-tele.patch
+++ b/patches/server/0676-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0678-Implement-getComputedBiome-API.patch b/patches/server/0677-Implement-getComputedBiome-API.patch
index 41624673a7..41624673a7 100644
--- a/patches/server/0678-Implement-getComputedBiome-API.patch
+++ b/patches/server/0677-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0679-Make-some-itemstacks-nonnull.patch b/patches/server/0678-Make-some-itemstacks-nonnull.patch
index 4679d4a859..4679d4a859 100644
--- a/patches/server/0679-Make-some-itemstacks-nonnull.patch
+++ b/patches/server/0678-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0680-Implement-enchantWithLevels-API.patch b/patches/server/0679-Implement-enchantWithLevels-API.patch
index 7bf61f04ba..7bf61f04ba 100644
--- a/patches/server/0680-Implement-enchantWithLevels-API.patch
+++ b/patches/server/0679-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0681-Fix-saving-in-unloadWorld.patch b/patches/server/0680-Fix-saving-in-unloadWorld.patch
index a045e38f34..a045e38f34 100644
--- a/patches/server/0681-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0680-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0682-Buffer-OOB-setBlock-calls.patch b/patches/server/0681-Buffer-OOB-setBlock-calls.patch
index 7bc7bd4823..7bc7bd4823 100644
--- a/patches/server/0682-Buffer-OOB-setBlock-calls.patch
+++ b/patches/server/0681-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0683-Add-TameableDeathMessageEvent.patch b/patches/server/0682-Add-TameableDeathMessageEvent.patch
index 1531307bd4..1531307bd4 100644
--- a/patches/server/0683-Add-TameableDeathMessageEvent.patch
+++ b/patches/server/0682-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0684-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0683-Fix-new-block-data-for-EntityChangeBlockEvent.patch
index 6dae9bf4a8..6dae9bf4a8 100644
--- a/patches/server/0684-Fix-new-block-data-for-EntityChangeBlockEvent.patch
+++ b/patches/server/0683-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0685-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0684-fix-player-loottables-running-when-mob-loot-gamerule.patch
index ad38317db7..ad38317db7 100644
--- a/patches/server/0685-fix-player-loottables-running-when-mob-loot-gamerule.patch
+++ b/patches/server/0684-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0686-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0685-Ensure-entity-passenger-world-matches-ridden-entity.patch
index ba6ce8567a..ba6ce8567a 100644
--- a/patches/server/0686-Ensure-entity-passenger-world-matches-ridden-entity.patch
+++ b/patches/server/0685-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0687-Cache-resource-keys-and-optimize-reference-Holder-ta.patch b/patches/server/0686-Cache-resource-keys-and-optimize-reference-Holder-ta.patch
index ddb3a70fde..ddb3a70fde 100644
--- a/patches/server/0687-Cache-resource-keys-and-optimize-reference-Holder-ta.patch
+++ b/patches/server/0686-Cache-resource-keys-and-optimize-reference-Holder-ta.patch
diff --git a/patches/server/0688-Allow-changing-the-EnderDragon-podium.patch b/patches/server/0687-Allow-changing-the-EnderDragon-podium.patch
index 4c615ac132..4c615ac132 100644
--- a/patches/server/0688-Allow-changing-the-EnderDragon-podium.patch
+++ b/patches/server/0687-Allow-changing-the-EnderDragon-podium.patch
diff --git a/patches/server/0689-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0688-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
index 265f2bbdbb..265f2bbdbb 100644
--- a/patches/server/0689-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
+++ b/patches/server/0688-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0690-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0689-Prevent-tile-entity-copies-loading-chunks.patch
index 50f78f59ad..50f78f59ad 100644
--- a/patches/server/0690-Prevent-tile-entity-copies-loading-chunks.patch
+++ b/patches/server/0689-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0691-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0690-Use-username-instead-of-display-name-in-PlayerList-g.patch
index 2fd1e02905..2fd1e02905 100644
--- a/patches/server/0691-Use-username-instead-of-display-name-in-PlayerList-g.patch
+++ b/patches/server/0690-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0692-Expand-PlayerItemDamageEvent.patch b/patches/server/0691-Expand-PlayerItemDamageEvent.patch
index 1650dd10f3..fac811b9d8 100644
--- a/patches/server/0692-Expand-PlayerItemDamageEvent.patch
+++ b/patches/server/0691-Expand-PlayerItemDamageEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expand PlayerItemDamageEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 1cfd41f36724f0c54489ad7c1c41486e45467a23..889263767ce3a2a4c43a2c61aa9d2d715392607c 100644
+index ec3be7fb4eb4560fe0106ac127f17d7437612157..bee59df6a8f30416f94c1a4fbd5e2629336e842f 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -650,10 +650,11 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0693-WorldCreator-keepSpawnLoaded.patch b/patches/server/0692-WorldCreator-keepSpawnLoaded.patch
index 3e941053cb..3e941053cb 100644
--- a/patches/server/0693-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0692-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0694-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0693-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
index ed8adb4503..ed8adb4503 100644
--- a/patches/server/0694-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
+++ b/patches/server/0693-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0695-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0694-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
index ed6f344427..ed6f344427 100644
--- a/patches/server/0695-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
+++ b/patches/server/0694-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0696-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0695-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index b73fc3193a..b73fc3193a 100644
--- a/patches/server/0696-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/server/0695-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0697-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0696-Fire-CauldronLevelChange-on-initial-fill.patch
index 07f836b363..07f836b363 100644
--- a/patches/server/0697-Fire-CauldronLevelChange-on-initial-fill.patch
+++ b/patches/server/0696-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0698-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0697-fix-powder-snow-cauldrons-not-turning-to-water.patch
index f277b93aa1..f277b93aa1 100644
--- a/patches/server/0698-fix-powder-snow-cauldrons-not-turning-to-water.patch
+++ b/patches/server/0697-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0699-Add-PlayerStopUsingItemEvent.patch b/patches/server/0698-Add-PlayerStopUsingItemEvent.patch
index b27685e2dc..b27685e2dc 100644
--- a/patches/server/0699-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/server/0698-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0700-Don-t-tick-markers.patch b/patches/server/0699-Don-t-tick-markers.patch
index 2f7a18f647..2f7a18f647 100644
--- a/patches/server/0700-Don-t-tick-markers.patch
+++ b/patches/server/0699-Don-t-tick-markers.patch
diff --git a/patches/server/0701-Expand-FallingBlock-API.patch b/patches/server/0700-Expand-FallingBlock-API.patch
index 84c7821142..84c7821142 100644
--- a/patches/server/0701-Expand-FallingBlock-API.patch
+++ b/patches/server/0700-Expand-FallingBlock-API.patch
diff --git a/patches/server/0702-Add-support-for-Proxy-Protocol.patch b/patches/server/0701-Add-support-for-Proxy-Protocol.patch
index aca878218f..aca878218f 100644
--- a/patches/server/0702-Add-support-for-Proxy-Protocol.patch
+++ b/patches/server/0701-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0703-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0702-Fix-OfflinePlayer-getBedSpawnLocation.patch
index 61c9b7dd07..4726c2f65c 100644
--- a/patches/server/0703-Fix-OfflinePlayer-getBedSpawnLocation.patch
+++ b/patches/server/0702-Fix-OfflinePlayer-getBedSpawnLocation.patch
@@ -8,7 +8,7 @@ instance of CraftOfflinePlayer the world was incorrect
 due to the logic for reading the NBT not being up-to-date.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index 411b280ac3e27e72091db813c0c9b69b62df6097..8caee0181f256e2ffd4e880274859eaf5f81ae96 100644
+index e0d342a0ddd140b342f7af138c71596c6d718788..30c1c203022c2ed777dcddfd68ef2e3752c62ea1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -37,6 +37,7 @@ import org.bukkit.profile.PlayerProfile;
diff --git a/patches/server/0704-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0703-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
index 7158b83635..7158b83635 100644
--- a/patches/server/0704-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
+++ b/patches/server/0703-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0705-Sanitize-sent-BlockEntity-NBT.patch b/patches/server/0704-Sanitize-sent-BlockEntity-NBT.patch
index 152674ac06..152674ac06 100644
--- a/patches/server/0705-Sanitize-sent-BlockEntity-NBT.patch
+++ b/patches/server/0704-Sanitize-sent-BlockEntity-NBT.patch
diff --git a/patches/server/0706-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0705-Disable-component-selector-resolving-in-books-by-def.patch
index 796fcc7f2a..796fcc7f2a 100644
--- a/patches/server/0706-Disable-component-selector-resolving-in-books-by-def.patch
+++ b/patches/server/0705-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0707-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0706-Prevent-entity-loading-causing-async-lookups.patch
index 52647af7c4..52647af7c4 100644
--- a/patches/server/0707-Prevent-entity-loading-causing-async-lookups.patch
+++ b/patches/server/0706-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0708-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0707-Throw-exception-on-world-create-while-being-ticked.patch
index 9d5d28e673..562543e709 100644
--- a/patches/server/0708-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0707-Throw-exception-on-world-create-while-being-ticked.patch
@@ -7,18 +7,18 @@ 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 8142e4a238066404f3d1685f9cee1a2b91cdd371..acdba56f025fe729398c5549175baad8e6818f62 100644
+index 94aa901b77b19445a33d5b2b24ba2e947d2a6aef..11b9eb8d7d5f9ad736f2c6784c5d9e745a355093 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -318,6 +318,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -317,6 +317,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; // Paper - add paper configuration files
-     public static long currentTickLong = 0L; // Paper - track current tick as a long
 +    public boolean isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
-@@ -1582,7 +1583,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1580,7 +1581,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 8142e4a238066404f3d1685f9cee1a2b91cdd371..acdba56f025fe729398c5549175baad8
  
          // CraftBukkit start
          // Run tasks that are waiting on processing
-@@ -1614,6 +1615,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1612,6 +1613,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Paper end - Perf: Optimize time updates
          MinecraftTimings.timeUpdateTimer.stopTiming(); // Spigot // Paper
  
@@ -36,7 +36,7 @@ index 8142e4a238066404f3d1685f9cee1a2b91cdd371..acdba56f025fe729398c5549175baad8
          while (iterator.hasNext()) {
              ServerLevel worldserver = (ServerLevel) iterator.next();
              worldserver.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - BlockPhysicsEvent
-@@ -1649,6 +1652,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1647,6 +1650,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.profiler.pop();
              worldserver.explosionDensityCache.clear(); // Paper - Optimize explosions
          }
diff --git a/patches/server/0709-Dont-resent-entity-on-art-update.patch b/patches/server/0708-Dont-resent-entity-on-art-update.patch
index 38d1a4ca58..38d1a4ca58 100644
--- a/patches/server/0709-Dont-resent-entity-on-art-update.patch
+++ b/patches/server/0708-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0710-Add-WardenAngerChangeEvent.patch b/patches/server/0709-Add-WardenAngerChangeEvent.patch
index 41f4251548..41f4251548 100644
--- a/patches/server/0710-Add-WardenAngerChangeEvent.patch
+++ b/patches/server/0709-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0711-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0710-Add-option-for-strict-advancement-dimension-checks.patch
index 488f84c884..488f84c884 100644
--- a/patches/server/0711-Add-option-for-strict-advancement-dimension-checks.patch
+++ b/patches/server/0710-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0712-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0711-Add-missing-important-BlockStateListPopulator-method.patch
index ecf565ebf6..ecf565ebf6 100644
--- a/patches/server/0712-Add-missing-important-BlockStateListPopulator-method.patch
+++ b/patches/server/0711-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0713-Nameable-Banner-API.patch b/patches/server/0712-Nameable-Banner-API.patch
index da3d804d8f..da3d804d8f 100644
--- a/patches/server/0713-Nameable-Banner-API.patch
+++ b/patches/server/0712-Nameable-Banner-API.patch
diff --git a/patches/server/0714-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0713-Don-t-broadcast-messages-to-command-blocks.patch
index 6a6b62cf6c..6a6b62cf6c 100644
--- a/patches/server/0714-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0713-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0715-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0714-Prevent-empty-items-from-being-added-to-world.patch
index 53f5579791..53f5579791 100644
--- a/patches/server/0715-Prevent-empty-items-from-being-added-to-world.patch
+++ b/patches/server/0714-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0716-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0715-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
index c2e21a749e..c2e21a749e 100644
--- a/patches/server/0716-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
+++ b/patches/server/0715-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0717-Add-Player-getFishHook.patch b/patches/server/0716-Add-Player-getFishHook.patch
index 99c85d33b3..99c85d33b3 100644
--- a/patches/server/0717-Add-Player-getFishHook.patch
+++ b/patches/server/0716-Add-Player-getFishHook.patch
diff --git a/patches/server/0718-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0717-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
index 32aaf6dc6e..32aaf6dc6e 100644
--- a/patches/server/0718-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
+++ b/patches/server/0717-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0719-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0718-Add-various-missing-EntityDropItemEvent-calls.patch
index 2a92fcdc52..2a92fcdc52 100644
--- a/patches/server/0719-Add-various-missing-EntityDropItemEvent-calls.patch
+++ b/patches/server/0718-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0720-Fix-Bee-flower-NPE.patch b/patches/server/0719-Fix-Bee-flower-NPE.patch
index db6e1b0ad9..db6e1b0ad9 100644
--- a/patches/server/0720-Fix-Bee-flower-NPE.patch
+++ b/patches/server/0719-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0721-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0720-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
index 67b7b9467e..67b7b9467e 100644
--- a/patches/server/0721-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
+++ b/patches/server/0720-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0722-More-Teleport-API.patch b/patches/server/0721-More-Teleport-API.patch
index 3465cde97d..3465cde97d 100644
--- a/patches/server/0722-More-Teleport-API.patch
+++ b/patches/server/0721-More-Teleport-API.patch
diff --git a/patches/server/0723-Add-EntityPortalReadyEvent.patch b/patches/server/0722-Add-EntityPortalReadyEvent.patch
index 56705093a3..56705093a3 100644
--- a/patches/server/0723-Add-EntityPortalReadyEvent.patch
+++ b/patches/server/0722-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0724-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0723-Don-t-use-level-random-in-entity-constructors.patch
index cb41bd38c5..ec5bc5264e 100644
--- a/patches/server/0724-Don-t-use-level-random-in-entity-constructors.patch
+++ b/patches/server/0723-Don-t-use-level-random-in-entity-constructors.patch
@@ -9,7 +9,7 @@ should be supported. Some entities (for whatever
 reason) use the level's random in some places.
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 5448a0f54080ac02bc4ce8ad5645173b67841e1a..30056568a9701fcb664682f329175d3bfee79b60 100644
+index df90d5b934f41f5d8c232e93830d6690b6ccf401..446c319524183d6a1b4d0e6f0613a8db690677da 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -72,7 +72,12 @@ public class ItemEntity extends Entity implements TraceableEntity {
diff --git a/patches/server/0725-Send-block-entities-after-destroy-prediction.patch b/patches/server/0724-Send-block-entities-after-destroy-prediction.patch
index c039e444e1..c039e444e1 100644
--- a/patches/server/0725-Send-block-entities-after-destroy-prediction.patch
+++ b/patches/server/0724-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0726-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0725-Warn-on-plugins-accessing-faraway-chunks.patch
index a0023ba6e1..a0023ba6e1 100644
--- a/patches/server/0726-Warn-on-plugins-accessing-faraway-chunks.patch
+++ b/patches/server/0725-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0727-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0726-Custom-Chat-Completion-Suggestions-API.patch
index 13ea62b5e6..13ea62b5e6 100644
--- a/patches/server/0727-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/server/0726-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0728-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0727-Add-and-fix-missing-BlockFadeEvents.patch
index 062bad35bb..062bad35bb 100644
--- a/patches/server/0728-Add-and-fix-missing-BlockFadeEvents.patch
+++ b/patches/server/0727-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0729-Collision-API.patch b/patches/server/0728-Collision-API.patch
index f8bf3193f8..f8bf3193f8 100644
--- a/patches/server/0729-Collision-API.patch
+++ b/patches/server/0728-Collision-API.patch
diff --git a/patches/server/0730-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0729-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
index f661ad8722..f661ad8722 100644
--- a/patches/server/0730-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
+++ b/patches/server/0729-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0731-Block-Ticking-API.patch b/patches/server/0730-Block-Ticking-API.patch
index 9e5247f35f..9e5247f35f 100644
--- a/patches/server/0731-Block-Ticking-API.patch
+++ b/patches/server/0730-Block-Ticking-API.patch
diff --git a/patches/server/0732-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0731-Add-Velocity-IP-Forwarding-Support.patch
index 9352ac5b67..9352ac5b67 100644
--- a/patches/server/0732-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0731-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0733-Add-NamespacedKey-biome-methods.patch b/patches/server/0732-Add-NamespacedKey-biome-methods.patch
index 1b67c6785e..1b67c6785e 100644
--- a/patches/server/0733-Add-NamespacedKey-biome-methods.patch
+++ b/patches/server/0732-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/server/0734-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0733-Fix-plugin-loggers-on-server-shutdown.patch
index 6f6ce54a0d..4a610485e6 100644
--- a/patches/server/0734-Fix-plugin-loggers-on-server-shutdown.patch
+++ b/patches/server/0733-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 acdba56f025fe729398c5549175baad8e6818f62..3aba668f9a34cabc26063c61660ab22f83b1070e 100644
+index 11b9eb8d7d5f9ad736f2c6784c5d9e745a355093..bef05e09c654794405832ad75c3471f63399dfee 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1239,6 +1239,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1237,6 +1237,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  } catch (Exception ignored) {
                  }
                  // CraftBukkit end
diff --git a/patches/server/0735-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0734-Stop-large-look-changes-from-crashing-the-server.patch
index 1346524b91..1346524b91 100644
--- a/patches/server/0735-Stop-large-look-changes-from-crashing-the-server.patch
+++ b/patches/server/0734-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0736-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0735-Fire-EntityChangeBlockEvent-in-more-places.patch
index bafa064971..bafa064971 100644
--- a/patches/server/0736-Fire-EntityChangeBlockEvent-in-more-places.patch
+++ b/patches/server/0735-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0737-Missing-eating-regain-reason.patch b/patches/server/0736-Missing-eating-regain-reason.patch
index af804e161b..af804e161b 100644
--- a/patches/server/0737-Missing-eating-regain-reason.patch
+++ b/patches/server/0736-Missing-eating-regain-reason.patch
diff --git a/patches/server/0738-Missing-effect-cause.patch b/patches/server/0737-Missing-effect-cause.patch
index e24048113b..e24048113b 100644
--- a/patches/server/0738-Missing-effect-cause.patch
+++ b/patches/server/0737-Missing-effect-cause.patch
diff --git a/patches/server/0739-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0738-Added-byte-array-serialization-deserialization-for-P.patch
index f2a4d437f0..f2a4d437f0 100644
--- a/patches/server/0739-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/server/0738-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0740-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0739-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index 5f204ad2ba..5f204ad2ba 100644
--- a/patches/server/0740-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/server/0739-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0741-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0740-Call-BlockPhysicsEvent-more-often.patch
index 1839fbe711..1839fbe711 100644
--- a/patches/server/0741-Call-BlockPhysicsEvent-more-often.patch
+++ b/patches/server/0740-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0742-Configurable-chat-thread-limit.patch b/patches/server/0741-Configurable-chat-thread-limit.patch
index 57178397ba..57178397ba 100644
--- a/patches/server/0742-Configurable-chat-thread-limit.patch
+++ b/patches/server/0741-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0743-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0742-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
index aaf56a3c17..aaf56a3c17 100644
--- a/patches/server/0743-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
+++ b/patches/server/0742-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0744-fix-Jigsaw-block-kicking-user.patch b/patches/server/0743-fix-Jigsaw-block-kicking-user.patch
index 6e1aef94c8..6e1aef94c8 100644
--- a/patches/server/0744-fix-Jigsaw-block-kicking-user.patch
+++ b/patches/server/0743-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0745-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0744-use-BlockFormEvent-for-mud-converting-into-clay.patch
index 8653ffd786..8653ffd786 100644
--- a/patches/server/0745-use-BlockFormEvent-for-mud-converting-into-clay.patch
+++ b/patches/server/0744-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0746-Add-getDrops-to-BlockState.patch b/patches/server/0745-Add-getDrops-to-BlockState.patch
index ea12f69bde..ea12f69bde 100644
--- a/patches/server/0746-Add-getDrops-to-BlockState.patch
+++ b/patches/server/0745-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0747-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0746-Fix-a-bunch-of-vanilla-bugs.patch
index 7813123f49..7813123f49 100644
--- a/patches/server/0747-Fix-a-bunch-of-vanilla-bugs.patch
+++ b/patches/server/0746-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0748-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0747-Remove-unnecessary-onTrackingStart-during-navigation.patch
index 4de44632f0..4de44632f0 100644
--- a/patches/server/0748-Remove-unnecessary-onTrackingStart-during-navigation.patch
+++ b/patches/server/0747-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0749-Fix-custom-piglin-loved-items.patch b/patches/server/0748-Fix-custom-piglin-loved-items.patch
index a09a51f7ea..a09a51f7ea 100644
--- a/patches/server/0749-Fix-custom-piglin-loved-items.patch
+++ b/patches/server/0748-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0750-EntityPickupItemEvent-fixes.patch b/patches/server/0749-EntityPickupItemEvent-fixes.patch
index 91c0eac860..91c0eac860 100644
--- a/patches/server/0750-EntityPickupItemEvent-fixes.patch
+++ b/patches/server/0749-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0751-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0750-Correctly-handle-interactions-with-items-on-cooldown.patch
index b7fa362a4b..b7fa362a4b 100644
--- a/patches/server/0751-Correctly-handle-interactions-with-items-on-cooldown.patch
+++ b/patches/server/0750-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0752-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0751-Add-PlayerInventorySlotChangeEvent.patch
index 0f6a75faa3..0f6a75faa3 100644
--- a/patches/server/0752-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/server/0751-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0753-Elder-Guardian-appearance-API.patch b/patches/server/0752-Elder-Guardian-appearance-API.patch
index fd1cef6a09..fd1cef6a09 100644
--- a/patches/server/0753-Elder-Guardian-appearance-API.patch
+++ b/patches/server/0752-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0754-Add-entity-knockback-API.patch b/patches/server/0753-Add-entity-knockback-API.patch
index d390d3fbd4..d390d3fbd4 100644
--- a/patches/server/0754-Add-entity-knockback-API.patch
+++ b/patches/server/0753-Add-entity-knockback-API.patch
diff --git a/patches/server/0755-Detect-headless-JREs.patch b/patches/server/0754-Detect-headless-JREs.patch
index 5ba28913a8..5ba28913a8 100644
--- a/patches/server/0755-Detect-headless-JREs.patch
+++ b/patches/server/0754-Detect-headless-JREs.patch
diff --git a/patches/server/0756-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0755-fix-entity-vehicle-collision-event-not-called.patch
index e2f922a2a1..e2f922a2a1 100644
--- a/patches/server/0756-fix-entity-vehicle-collision-event-not-called.patch
+++ b/patches/server/0755-fix-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0757-Add-EntityToggleSitEvent.patch b/patches/server/0756-Add-EntityToggleSitEvent.patch
index 0ed0b95562..0ed0b95562 100644
--- a/patches/server/0757-Add-EntityToggleSitEvent.patch
+++ b/patches/server/0756-Add-EntityToggleSitEvent.patch
diff --git a/patches/server/0758-Add-fire-tick-delay-option.patch b/patches/server/0757-Add-fire-tick-delay-option.patch
index 2ad454d1c6..2ad454d1c6 100644
--- a/patches/server/0758-Add-fire-tick-delay-option.patch
+++ b/patches/server/0757-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0759-Add-Moving-Piston-API.patch b/patches/server/0758-Add-Moving-Piston-API.patch
index e3d3955822..e3d3955822 100644
--- a/patches/server/0759-Add-Moving-Piston-API.patch
+++ b/patches/server/0758-Add-Moving-Piston-API.patch
diff --git a/patches/server/0760-Ignore-impossible-spawn-tick.patch b/patches/server/0759-Ignore-impossible-spawn-tick.patch
index f046102ceb..f046102ceb 100644
--- a/patches/server/0760-Ignore-impossible-spawn-tick.patch
+++ b/patches/server/0759-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0761-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch b/patches/server/0760-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch
index 2fe35c8b32..2fe35c8b32 100644
--- a/patches/server/0761-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch
+++ b/patches/server/0760-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch
diff --git a/patches/server/0762-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0761-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
index cd0b3b2cc7..cd0b3b2cc7 100644
--- a/patches/server/0762-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
+++ b/patches/server/0761-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0763-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0762-Add-PrePlayerAttackEntityEvent.patch
index b0f3a07890..b0f3a07890 100644
--- a/patches/server/0763-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/server/0762-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0764-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0763-ensure-reset-EnderDragon-boss-event-name.patch
index e2a769583d..e2a769583d 100644
--- a/patches/server/0764-ensure-reset-EnderDragon-boss-event-name.patch
+++ b/patches/server/0763-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0765-Add-Player-Warden-Warning-API.patch b/patches/server/0764-Add-Player-Warden-Warning-API.patch
index bbb7bff753..bbb7bff753 100644
--- a/patches/server/0765-Add-Player-Warden-Warning-API.patch
+++ b/patches/server/0764-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0766-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0765-More-vanilla-friendly-methods-to-update-trades.patch
index 5c30d5f82c..5c30d5f82c 100644
--- a/patches/server/0766-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/server/0765-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0767-Add-paper-dumplisteners-command.patch b/patches/server/0766-Add-paper-dumplisteners-command.patch
index aabb60033d..aabb60033d 100644
--- a/patches/server/0767-Add-paper-dumplisteners-command.patch
+++ b/patches/server/0766-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0768-check-global-player-list-where-appropriate.patch b/patches/server/0767-check-global-player-list-where-appropriate.patch
index cc1aa7af3e..cc1aa7af3e 100644
--- a/patches/server/0768-check-global-player-list-where-appropriate.patch
+++ b/patches/server/0767-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0769-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0768-Fix-async-entity-add-due-to-fungus-trees.patch
index 2a7830d952..2a7830d952 100644
--- a/patches/server/0769-Fix-async-entity-add-due-to-fungus-trees.patch
+++ b/patches/server/0768-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0770-ItemStack-damage-API.patch b/patches/server/0769-ItemStack-damage-API.patch
index 0455f41b1b..0764ff724b 100644
--- a/patches/server/0770-ItemStack-damage-API.patch
+++ b/patches/server/0769-ItemStack-damage-API.patch
@@ -11,7 +11,7 @@ the logic associated with damaging them
 public net.minecraft.world.entity.LivingEntity entityEventForEquipmentBreak(Lnet/minecraft/world/entity/EquipmentSlot;)B
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 889263767ce3a2a4c43a2c61aa9d2d715392607c..8bf5783414b7dbe5c01a4ed1286e543426f20698 100644
+index bee59df6a8f30416f94c1a4fbd5e2629336e842f..e64cc91b416bbbefe6aadf1c6b685346cf258ab4 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -647,8 +647,13 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0771-Friction-API.patch b/patches/server/0770-Friction-API.patch
index c4c9c37444..483e1cfebe 100644
--- a/patches/server/0771-Friction-API.patch
+++ b/patches/server/0770-Friction-API.patch
@@ -55,7 +55,7 @@ index f662a791e8cb045903a0de29778e5f30892fb766..2bb61084b628582ded44926d7697ee26
              this.getAttributes().load(nbt.getList("attributes", 10));
          }
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 30056568a9701fcb664682f329175d3bfee79b60..ea0d9335446b20073b9aafb9de453097355db79c 100644
+index 446c319524183d6a1b4d0e6f0613a8db690677da..cbfb07bdf8d5e2e5a462835184be2d47e59d506c 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -63,6 +63,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
@@ -66,7 +66,7 @@ index 30056568a9701fcb664682f329175d3bfee79b60..ea0d9335446b20073b9aafb9de453097
  
      public ItemEntity(EntityType<? extends ItemEntity> type, Level world) {
          super(type, world);
-@@ -186,7 +187,11 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -185,7 +186,11 @@ public class ItemEntity extends Entity implements TraceableEntity {
                  this.move(MoverType.SELF, this.getDeltaMovement());
                  float f = 0.98F;
  
@@ -79,7 +79,7 @@ index 30056568a9701fcb664682f329175d3bfee79b60..ea0d9335446b20073b9aafb9de453097
                      f = this.level().getBlockState(this.getBlockPosBelowThatAffectsMyMovement()).getBlock().getFriction() * 0.98F;
                  }
  
-@@ -395,6 +400,11 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -393,6 +398,11 @@ public class ItemEntity extends Entity implements TraceableEntity {
  
      @Override
      public void addAdditionalSaveData(CompoundTag nbt) {
@@ -91,7 +91,7 @@ index 30056568a9701fcb664682f329175d3bfee79b60..ea0d9335446b20073b9aafb9de453097
          nbt.putShort("Health", (short) this.health);
          nbt.putShort("Age", (short) this.age);
          nbt.putShort("PickupDelay", (short) this.pickupDelay);
-@@ -437,6 +447,17 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -435,6 +445,17 @@ public class ItemEntity extends Entity implements TraceableEntity {
              this.setItem(ItemStack.EMPTY);
          }
  
diff --git a/patches/server/0772-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0771-Ability-to-control-player-s-insomnia-and-phantoms.patch
index 5bc45a7af4..03be2495a7 100644
--- a/patches/server/0772-Ability-to-control-player-s-insomnia-and-phantoms.patch
+++ b/patches/server/0771-Ability-to-control-player-s-insomnia-and-phantoms.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ability to control player's insomnia and phantoms
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntitySelector.java b/src/main/java/net/minecraft/world/entity/EntitySelector.java
-index e382a29b441b656f35bc24cb90f95cb4def433d2..d8cc5614502db7025349e085381b6b32ad32296a 100644
+index 302decdccd37c5579473c8fc33adda3956be7603..dca7b99e97f21bf6cfae6ee69eeac95d0bcf6863 100644
 --- a/src/main/java/net/minecraft/world/entity/EntitySelector.java
 +++ b/src/main/java/net/minecraft/world/entity/EntitySelector.java
 @@ -28,7 +28,18 @@ public final class EntitySelector {
diff --git a/patches/server/0773-Fix-premature-player-kicks-on-shutdown.patch b/patches/server/0772-Fix-premature-player-kicks-on-shutdown.patch
index d3dbe3d230..034840341e 100644
--- a/patches/server/0773-Fix-premature-player-kicks-on-shutdown.patch
+++ b/patches/server/0772-Fix-premature-player-kicks-on-shutdown.patch
@@ -47,10 +47,10 @@ index 4d9f1fc884050993287adfa4578a87da710623fb..a8dfe7a4b3d01bf75587be078f471d1e
                          this.disconnect((Component) Component.translatable("multiplayer.disconnect.server_shutdown"));
                      } catch (ClassCastException classcastexception) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3aba668f9a34cabc26063c61660ab22f83b1070e..a72b278826be1d0da79ca619ea9a9a437fa9c54b 100644
+index bef05e09c654794405832ad75c3471f63399dfee..2cc22a9a5483c62cdf64870f5ce62b33018bef06 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2093,7 +2093,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2091,7 +2091,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      @Override
      public void executeIfPossible(Runnable runnable) {
          if (this.isStopped()) {
diff --git a/patches/server/0774-Sync-offhand-slot-in-menus.patch b/patches/server/0773-Sync-offhand-slot-in-menus.patch
index f613fba84b..f613fba84b 100644
--- a/patches/server/0774-Sync-offhand-slot-in-menus.patch
+++ b/patches/server/0773-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0775-Player-Entity-Tracking-Events.patch b/patches/server/0774-Player-Entity-Tracking-Events.patch
index ceec0058a6..ceec0058a6 100644
--- a/patches/server/0775-Player-Entity-Tracking-Events.patch
+++ b/patches/server/0774-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0776-Limit-pet-look-distance.patch b/patches/server/0775-Limit-pet-look-distance.patch
index 983f861539..983f861539 100644
--- a/patches/server/0776-Limit-pet-look-distance.patch
+++ b/patches/server/0775-Limit-pet-look-distance.patch
diff --git a/patches/server/0777-fix-Instruments.patch b/patches/server/0776-fix-Instruments.patch
index c2cffdb2b5..c2cffdb2b5 100644
--- a/patches/server/0777-fix-Instruments.patch
+++ b/patches/server/0776-fix-Instruments.patch
diff --git a/patches/server/0778-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0777-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
index 420107d5c3..420107d5c3 100644
--- a/patches/server/0778-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ b/patches/server/0777-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0779-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0778-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
index 8b797606ed..8b797606ed 100644
--- a/patches/server/0779-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
+++ b/patches/server/0778-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0780-Add-BlockLockCheckEvent.patch b/patches/server/0779-Add-BlockLockCheckEvent.patch
index 31fba739ae..31fba739ae 100644
--- a/patches/server/0780-Add-BlockLockCheckEvent.patch
+++ b/patches/server/0779-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0781-Add-Sneaking-API-for-Entities.patch b/patches/server/0780-Add-Sneaking-API-for-Entities.patch
index aaee22c056..aaee22c056 100644
--- a/patches/server/0781-Add-Sneaking-API-for-Entities.patch
+++ b/patches/server/0780-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0782-Improve-logging-and-errors.patch b/patches/server/0781-Improve-logging-and-errors.patch
index d2ccc7abed..d2ccc7abed 100644
--- a/patches/server/0782-Improve-logging-and-errors.patch
+++ b/patches/server/0781-Improve-logging-and-errors.patch
diff --git a/patches/server/0783-Improve-PortalEvents.patch b/patches/server/0782-Improve-PortalEvents.patch
index bb191a7362..bb191a7362 100644
--- a/patches/server/0783-Improve-PortalEvents.patch
+++ b/patches/server/0782-Improve-PortalEvents.patch
diff --git a/patches/server/0784-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0783-Add-config-option-for-spider-worldborder-climbing.patch
index 71e3939753..71e3939753 100644
--- a/patches/server/0784-Add-config-option-for-spider-worldborder-climbing.patch
+++ b/patches/server/0783-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0785-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0784-Add-missing-SpigotConfig-logCommands-check.patch
index 9c86e0000a..9c86e0000a 100644
--- a/patches/server/0785-Add-missing-SpigotConfig-logCommands-check.patch
+++ b/patches/server/0784-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0786-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0785-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
index 581ad00ec1..581ad00ec1 100644
--- a/patches/server/0786-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
+++ b/patches/server/0785-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0787-Flying-Fall-Damage.patch b/patches/server/0786-Flying-Fall-Damage.patch
index cee20a07da..cee20a07da 100644
--- a/patches/server/0787-Flying-Fall-Damage.patch
+++ b/patches/server/0786-Flying-Fall-Damage.patch
diff --git a/patches/server/0788-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0787-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
index 80118a6499..80118a6499 100644
--- a/patches/server/0788-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
+++ b/patches/server/0787-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0789-config-for-disabling-entity-tag-tags.patch b/patches/server/0788-config-for-disabling-entity-tag-tags.patch
index aabc1e1a31..aabc1e1a31 100644
--- a/patches/server/0789-config-for-disabling-entity-tag-tags.patch
+++ b/patches/server/0788-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0790-Use-single-player-info-update-packet-on-join.patch b/patches/server/0789-Use-single-player-info-update-packet-on-join.patch
index bbf8785310..bbf8785310 100644
--- a/patches/server/0790-Use-single-player-info-update-packet-on-join.patch
+++ b/patches/server/0789-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0791-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0790-Correctly-shrink-items-during-EntityResurrectEvent.patch
index e7b31c3642..e7b31c3642 100644
--- a/patches/server/0791-Correctly-shrink-items-during-EntityResurrectEvent.patch
+++ b/patches/server/0790-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0792-Win-Screen-API.patch b/patches/server/0791-Win-Screen-API.patch
index 567b2236d9..567b2236d9 100644
--- a/patches/server/0792-Win-Screen-API.patch
+++ b/patches/server/0791-Win-Screen-API.patch
diff --git a/patches/server/0793-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0792-Remove-CraftItemStack-setAmount-null-assignment.patch
index 5b5c421ff2..5b5c421ff2 100644
--- a/patches/server/0793-Remove-CraftItemStack-setAmount-null-assignment.patch
+++ b/patches/server/0792-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0794-Fix-force-opening-enchantment-tables.patch b/patches/server/0793-Fix-force-opening-enchantment-tables.patch
index 89326fc719..89326fc719 100644
--- a/patches/server/0794-Fix-force-opening-enchantment-tables.patch
+++ b/patches/server/0793-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0795-Add-Entity-Body-Yaw-API.patch b/patches/server/0794-Add-Entity-Body-Yaw-API.patch
index da33e1c8c9..da33e1c8c9 100644
--- a/patches/server/0795-Add-Entity-Body-Yaw-API.patch
+++ b/patches/server/0794-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0796-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0795-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
index 962917dab8..962917dab8 100644
--- a/patches/server/0796-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
+++ b/patches/server/0795-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0797-Add-EntityFertilizeEggEvent.patch b/patches/server/0796-Add-EntityFertilizeEggEvent.patch
index 07253994cb..07253994cb 100644
--- a/patches/server/0797-Add-EntityFertilizeEggEvent.patch
+++ b/patches/server/0796-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0798-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0797-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
index b804a77828..b804a77828 100644
--- a/patches/server/0798-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
+++ b/patches/server/0797-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0799-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0798-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 85321a4a5b..85321a4a5b 100644
--- a/patches/server/0799-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/server/0798-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0800-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0799-Correctly-handle-ArmorStand-invisibility.patch
index 34b66d686a..34b66d686a 100644
--- a/patches/server/0800-Correctly-handle-ArmorStand-invisibility.patch
+++ b/patches/server/0799-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0801-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0800-Fix-advancement-triggers-for-entity-damage.patch
index 94c53ab61c..94c53ab61c 100644
--- a/patches/server/0801-Fix-advancement-triggers-for-entity-damage.patch
+++ b/patches/server/0800-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0802-Fix-text-display-error-on-spawn.patch b/patches/server/0801-Fix-text-display-error-on-spawn.patch
index 7f64cfe6d9..7f64cfe6d9 100644
--- a/patches/server/0802-Fix-text-display-error-on-spawn.patch
+++ b/patches/server/0801-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0803-Fix-inventories-returning-null-Locations.patch b/patches/server/0802-Fix-inventories-returning-null-Locations.patch
index 23413d6b03..23413d6b03 100644
--- a/patches/server/0803-Fix-inventories-returning-null-Locations.patch
+++ b/patches/server/0802-Fix-inventories-returning-null-Locations.patch
diff --git a/patches/server/0804-Add-Shearable-API.patch b/patches/server/0803-Add-Shearable-API.patch
index 069dcbaf2e..069dcbaf2e 100644
--- a/patches/server/0804-Add-Shearable-API.patch
+++ b/patches/server/0803-Add-Shearable-API.patch
diff --git a/patches/server/0805-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0804-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 254a94df3a..254a94df3a 100644
--- a/patches/server/0805-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/server/0804-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0806-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0805-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
index d90e599897..d90e599897 100644
--- a/patches/server/0806-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
+++ b/patches/server/0805-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0807-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0806-Treat-sequence-violations-like-they-should-be.patch
index e0fce8efce..e0fce8efce 100644
--- a/patches/server/0807-Treat-sequence-violations-like-they-should-be.patch
+++ b/patches/server/0806-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0808-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0807-Prevent-causing-expired-keys-from-impacting-new-join.patch
index ee811c8ba6..ee811c8ba6 100644
--- a/patches/server/0808-Prevent-causing-expired-keys-from-impacting-new-join.patch
+++ b/patches/server/0807-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0809-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0808-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
index 3306163498..3306163498 100644
--- a/patches/server/0809-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
+++ b/patches/server/0808-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0810-Use-array-for-gamerule-storage.patch b/patches/server/0809-Use-array-for-gamerule-storage.patch
index 194ff8f15b..194ff8f15b 100644
--- a/patches/server/0810-Use-array-for-gamerule-storage.patch
+++ b/patches/server/0809-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0811-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0810-Fix-a-couple-of-upstream-bed-issues.patch
index 665db524c5..665db524c5 100644
--- a/patches/server/0811-Fix-a-couple-of-upstream-bed-issues.patch
+++ b/patches/server/0810-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0812-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0811-Fix-demo-flag-not-enabling-demo-mode.patch
index d64dd23e37..d64dd23e37 100644
--- a/patches/server/0812-Fix-demo-flag-not-enabling-demo-mode.patch
+++ b/patches/server/0811-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0813-Add-Mob-Experience-reward-API.patch b/patches/server/0812-Add-Mob-Experience-reward-API.patch
index f82f765beb..f82f765beb 100644
--- a/patches/server/0813-Add-Mob-Experience-reward-API.patch
+++ b/patches/server/0812-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0814-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0813-Break-redstone-on-top-of-trap-doors-early.patch
index 11c427e808..11c427e808 100644
--- a/patches/server/0814-Break-redstone-on-top-of-trap-doors-early.patch
+++ b/patches/server/0813-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0815-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0814-Avoid-Lazy-Initialization-for-Enum-Fields.patch
index becde16ce8..becde16ce8 100644
--- a/patches/server/0815-Avoid-Lazy-Initialization-for-Enum-Fields.patch
+++ b/patches/server/0814-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0816-More-accurate-isInOpenWater-impl.patch b/patches/server/0815-More-accurate-isInOpenWater-impl.patch
index 6e110094dd..6e110094dd 100644
--- a/patches/server/0816-More-accurate-isInOpenWater-impl.patch
+++ b/patches/server/0815-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0817-Expand-PlayerItemMendEvent.patch b/patches/server/0816-Expand-PlayerItemMendEvent.patch
index 289fae7adb..289fae7adb 100644
--- a/patches/server/0817-Expand-PlayerItemMendEvent.patch
+++ b/patches/server/0816-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0818-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0817-Refresh-ProjectileSource-for-projectiles.patch
index 4a5117fd04..59deace234 100644
--- a/patches/server/0818-Refresh-ProjectileSource-for-projectiles.patch
+++ b/patches/server/0817-Refresh-ProjectileSource-for-projectiles.patch
@@ -26,7 +26,7 @@ index 34e175b28f7c9120b58fc8e2b65ca978c7f301b5..cd362a91ad31dbae94fdb5a8c7183957
      public boolean lastDamageCancelled; // SPIGOT-5339, SPIGOT-6252, SPIGOT-6777: Keep track if the event was canceled
      public boolean persistentInvisibility = false;
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index dd53501d39113c4b0b5950bad70a5c667c0781c5..4b71538d5e921af89c4b13200484d4767e4dd6f9 100644
+index 63ffa02f820d88f865ae604712edcf2ac13f0bff..f2bdd95a6ae77400742d87bcae35c09fb8b047ba 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -57,14 +57,31 @@ public abstract class Projectile extends Entity implements TraceableEntity {
diff --git a/patches/server/0819-Add-transient-modifier-API.patch b/patches/server/0818-Add-transient-modifier-API.patch
index 36cc0a030a..36cc0a030a 100644
--- a/patches/server/0819-Add-transient-modifier-API.patch
+++ b/patches/server/0818-Add-transient-modifier-API.patch
diff --git a/patches/server/0820-Fix-block-place-logic.patch b/patches/server/0819-Fix-block-place-logic.patch
index accea4ee7c..accea4ee7c 100644
--- a/patches/server/0820-Fix-block-place-logic.patch
+++ b/patches/server/0819-Fix-block-place-logic.patch
diff --git a/patches/server/0821-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0820-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
index 6b029362ad..c44ec5216d 100644
--- a/patches/server/0821-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
+++ b/patches/server/0820-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix spigot sound playing for BlockItem ItemStacks
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 8bf5783414b7dbe5c01a4ed1286e543426f20698..67728baaaeac7c0fe353e30ae681eec24af3aff2 100644
+index e64cc91b416bbbefe6aadf1c6b685346cf258ab4..276858d23be2f9443cc364046a55b9c9a88bf4ea 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -571,7 +571,11 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0822-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0821-Call-BlockGrowEvent-for-missing-blocks.patch
index 895a528de8..895a528de8 100644
--- a/patches/server/0822-Call-BlockGrowEvent-for-missing-blocks.patch
+++ b/patches/server/0821-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0823-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0822-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index 0eb4dc7f69..0eb4dc7f69 100644
--- a/patches/server/0823-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0822-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0824-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0823-fix-MapLike-spam-for-missing-key-selector.patch
index 2bd3b889f1..2bd3b889f1 100644
--- a/patches/server/0824-fix-MapLike-spam-for-missing-key-selector.patch
+++ b/patches/server/0823-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0825-Fix-sniffer-removeExploredLocation.patch b/patches/server/0824-Fix-sniffer-removeExploredLocation.patch
index e8b1703090..e8b1703090 100644
--- a/patches/server/0825-Fix-sniffer-removeExploredLocation.patch
+++ b/patches/server/0824-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0826-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0825-Add-method-to-remove-all-active-potion-effects.patch
index beee87ef9d..beee87ef9d 100644
--- a/patches/server/0826-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/server/0825-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0827-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0826-Fix-incorrect-crafting-result-amount-for-fireworks.patch
index ed5525cfda..ed5525cfda 100644
--- a/patches/server/0827-Fix-incorrect-crafting-result-amount-for-fireworks.patch
+++ b/patches/server/0826-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0828-Add-event-for-player-editing-sign.patch b/patches/server/0827-Add-event-for-player-editing-sign.patch
index 0f29231215..df5567a67f 100644
--- a/patches/server/0828-Add-event-for-player-editing-sign.patch
+++ b/patches/server/0827-Add-event-for-player-editing-sign.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add event for player editing sign
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 67728baaaeac7c0fe353e30ae681eec24af3aff2..67ccd3065962a60d9a1676f13e383ed1f8a00d20 100644
+index 276858d23be2f9443cc364046a55b9c9a88bf4ea..10b3e41d589d480046e15a957902c2751b731cec 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -550,7 +550,7 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0829-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0828-Only-tick-item-frames-if-players-can-see-it.patch
index bf73ba4a5c..bf73ba4a5c 100644
--- a/patches/server/0829-Only-tick-item-frames-if-players-can-see-it.patch
+++ b/patches/server/0828-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0830-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0829-Fix-cmd-permission-levels-for-command-blocks.patch
index 5167eee08c..5167eee08c 100644
--- a/patches/server/0830-Fix-cmd-permission-levels-for-command-blocks.patch
+++ b/patches/server/0829-Fix-cmd-permission-levels-for-command-blocks.patch
diff --git a/patches/server/0831-Add-option-to-disable-block-updates.patch b/patches/server/0830-Add-option-to-disable-block-updates.patch
index 8fe599472e..8fe599472e 100644
--- a/patches/server/0831-Add-option-to-disable-block-updates.patch
+++ b/patches/server/0830-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0832-Call-missing-BlockDispenseEvent.patch b/patches/server/0831-Call-missing-BlockDispenseEvent.patch
index ca534e4617..ca534e4617 100644
--- a/patches/server/0832-Call-missing-BlockDispenseEvent.patch
+++ b/patches/server/0831-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0833-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0832-Don-t-load-chunks-for-supporting-block-checks.patch
index db2c15729d..db2c15729d 100644
--- a/patches/server/0833-Don-t-load-chunks-for-supporting-block-checks.patch
+++ b/patches/server/0832-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0834-Optimize-player-lookups-for-beacons.patch b/patches/server/0833-Optimize-player-lookups-for-beacons.patch
index 1c203c23a6..1c203c23a6 100644
--- a/patches/server/0834-Optimize-player-lookups-for-beacons.patch
+++ b/patches/server/0833-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0835-More-Sign-Block-API.patch b/patches/server/0834-More-Sign-Block-API.patch
index 3be6f4e353..3be6f4e353 100644
--- a/patches/server/0835-More-Sign-Block-API.patch
+++ b/patches/server/0834-More-Sign-Block-API.patch
diff --git a/patches/server/0836-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0835-fix-item-meta-for-tadpole-buckets.patch
index b367979963..b367979963 100644
--- a/patches/server/0836-fix-item-meta-for-tadpole-buckets.patch
+++ b/patches/server/0835-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0837-Fix-BanList-API.patch b/patches/server/0836-Fix-BanList-API.patch
index 0ed02f9e9c..352a89b454 100644
--- a/patches/server/0837-Fix-BanList-API.patch
+++ b/patches/server/0836-Fix-BanList-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix BanList API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index 8caee0181f256e2ffd4e880274859eaf5f81ae96..4d654c4f0b6210a9841427789ba70ce5d1d308be 100644
+index 30c1c203022c2ed777dcddfd68ef2e3752c62ea1..2c2c4db31a746b4eb853dc04c6b3e5631bbfa034 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -115,17 +115,17 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
@@ -256,7 +256,7 @@ index 3945a6ab723deee3ec3ebb5fbc726ce16bbca411..62914bde6f6b045e6b3682581899d756
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
-index 41bf260a599f46d410f234bac4dbad32142aa1cc..c216d8bf2fb836a17cca55375fbe67bc4f52d54a 100644
+index d9cc76d7e60001957c0f59fdc32d016f3589aa08..f58dec12326734c61f4bc2298a87fb38f1ac1dc4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
 +++ b/src/main/java/org/bukkit/craftbukkit/profile/CraftPlayerProfile.java
 @@ -31,7 +31,7 @@ import org.bukkit.profile.PlayerTextures;
diff --git a/patches/server/0838-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0837-Determine-lava-and-water-fluid-explosion-resistance-.patch
index 5f51eb317c..5f51eb317c 100644
--- a/patches/server/0838-Determine-lava-and-water-fluid-explosion-resistance-.patch
+++ b/patches/server/0837-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0839-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0838-Fix-possible-NPE-on-painting-creation.patch
index dc3838be94..dc3838be94 100644
--- a/patches/server/0839-Fix-possible-NPE-on-painting-creation.patch
+++ b/patches/server/0838-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0840-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0839-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
index 6785f755ab..6785f755ab 100644
--- a/patches/server/0840-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
+++ b/patches/server/0839-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0841-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0840-ExperienceOrb-should-call-EntitySpawnEvent.patch
index b70d980d31..b70d980d31 100644
--- a/patches/server/0841-ExperienceOrb-should-call-EntitySpawnEvent.patch
+++ b/patches/server/0840-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0842-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0841-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
index 301b345fb9..301b345fb9 100644
--- a/patches/server/0842-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
+++ b/patches/server/0841-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0843-Add-whitelist-events.patch b/patches/server/0842-Add-whitelist-events.patch
index 96884032fb..96884032fb 100644
--- a/patches/server/0843-Add-whitelist-events.patch
+++ b/patches/server/0842-Add-whitelist-events.patch
diff --git a/patches/server/0844-Implement-PlayerFailMoveEvent.patch b/patches/server/0843-Implement-PlayerFailMoveEvent.patch
index 6a55a3af38..6a55a3af38 100644
--- a/patches/server/0844-Implement-PlayerFailMoveEvent.patch
+++ b/patches/server/0843-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0845-Folia-scheduler-and-owned-region-API.patch b/patches/server/0844-Folia-scheduler-and-owned-region-API.patch
index 061c3c8e9b..ee5d5c140f 100644
--- a/patches/server/0845-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0844-Folia-scheduler-and-owned-region-API.patch
@@ -1148,10 +1148,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 a72b278826be1d0da79ca619ea9a9a437fa9c54b..2dfa9c4c0c2ef489649944eed89d8c77c482b92f 100644
+index 2cc22a9a5483c62cdf64870f5ce62b33018bef06..3ee0e2adf576e312c18da90adc46160ad85179fb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1578,6 +1578,20 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1576,6 +1576,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
diff --git a/patches/server/0846-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0845-Only-erase-allay-memory-on-non-item-targets.patch
index 4afac36fc3..4afac36fc3 100644
--- a/patches/server/0846-Only-erase-allay-memory-on-non-item-targets.patch
+++ b/patches/server/0845-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0847-API-for-updating-recipes-on-clients.patch b/patches/server/0846-API-for-updating-recipes-on-clients.patch
index 54f4e830b0..54f4e830b0 100644
--- a/patches/server/0847-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0846-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0848-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0847-Fix-rotation-when-spawning-display-entities.patch
index 7491ff60fe..7491ff60fe 100644
--- a/patches/server/0848-Fix-rotation-when-spawning-display-entities.patch
+++ b/patches/server/0847-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0849-Only-capture-actual-tree-growth.patch b/patches/server/0848-Only-capture-actual-tree-growth.patch
index 039d1ea70b..aef612bcaa 100644
--- a/patches/server/0849-Only-capture-actual-tree-growth.patch
+++ b/patches/server/0848-Only-capture-actual-tree-growth.patch
@@ -17,7 +17,7 @@ index 78951f50188528718cdb3dbbaabe3f9f2760ffe3..7826e2a52da47914aca39fef958b8f39
                      }
                  }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 67ccd3065962a60d9a1676f13e383ed1f8a00d20..355e461da5551e38bbc2ede69c5818f7db27011c 100644
+index 10b3e41d589d480046e15a957902c2751b731cec..87cae96faf33fa0491b13add79e02fc225bd2f70 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -466,6 +466,7 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0850-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0849-Use-correct-source-for-mushroom-block-spread-event.patch
index a295e29bcb..a295e29bcb 100644
--- a/patches/server/0850-Use-correct-source-for-mushroom-block-spread-event.patch
+++ b/patches/server/0849-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0851-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0850-Respect-randomizeData-on-more-entities-when-spawning.patch
index d04e8bf4f6..d04e8bf4f6 100644
--- a/patches/server/0851-Respect-randomizeData-on-more-entities-when-spawning.patch
+++ b/patches/server/0850-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0852-Use-correct-seed-on-api-world-load.patch b/patches/server/0851-Use-correct-seed-on-api-world-load.patch
index 764833c01d..764833c01d 100644
--- a/patches/server/0852-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0851-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0853-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0852-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
index 2f19c9d94a..2f19c9d94a 100644
--- a/patches/server/0853-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
+++ b/patches/server/0852-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0854-Cache-map-ids-on-item-frames.patch b/patches/server/0853-Cache-map-ids-on-item-frames.patch
index 65e3e3499f..65e3e3499f 100644
--- a/patches/server/0854-Cache-map-ids-on-item-frames.patch
+++ b/patches/server/0853-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0855-Fix-custom-statistic-criteria-creation.patch b/patches/server/0854-Fix-custom-statistic-criteria-creation.patch
index a3e8b66e3a..a3e8b66e3a 100644
--- a/patches/server/0855-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/server/0854-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0856-Bandaid-fix-for-Effect.patch b/patches/server/0855-Bandaid-fix-for-Effect.patch
index d7a85ce5c8..d7a85ce5c8 100644
--- a/patches/server/0856-Bandaid-fix-for-Effect.patch
+++ b/patches/server/0855-Bandaid-fix-for-Effect.patch
diff --git a/patches/server/0857-SculkCatalyst-bloom-API.patch b/patches/server/0856-SculkCatalyst-bloom-API.patch
index ba050f6086..ba050f6086 100644
--- a/patches/server/0857-SculkCatalyst-bloom-API.patch
+++ b/patches/server/0856-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0858-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0857-API-for-an-entity-s-scoreboard-name.patch
index ac804a3ed5..ac804a3ed5 100644
--- a/patches/server/0858-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/server/0857-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0859-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0858-Deprecate-and-replace-methods-with-old-StructureType.patch
index d34d5b18df..d34d5b18df 100644
--- a/patches/server/0859-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0858-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0860-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0859-Don-t-tab-complete-namespaced-commands-if-send-names.patch
index 5725b805f0..5725b805f0 100644
--- a/patches/server/0860-Don-t-tab-complete-namespaced-commands-if-send-names.patch
+++ b/patches/server/0859-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0861-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0860-Properly-handle-BlockBreakEvent-isDropItems.patch
index 75a746ca81..75a746ca81 100644
--- a/patches/server/0861-Properly-handle-BlockBreakEvent-isDropItems.patch
+++ b/patches/server/0860-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0862-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0861-Fire-entity-death-event-for-ender-dragon.patch
index 66624e354c..66624e354c 100644
--- a/patches/server/0862-Fire-entity-death-event-for-ender-dragon.patch
+++ b/patches/server/0861-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0863-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0862-Configurable-entity-tracking-range-by-Y-coordinate.patch
index 4b7085d831..4b7085d831 100644
--- a/patches/server/0863-Configurable-entity-tracking-range-by-Y-coordinate.patch
+++ b/patches/server/0862-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0864-Add-Listing-API-for-Player.patch b/patches/server/0863-Add-Listing-API-for-Player.patch
index bd96c74d58..bd96c74d58 100644
--- a/patches/server/0864-Add-Listing-API-for-Player.patch
+++ b/patches/server/0863-Add-Listing-API-for-Player.patch
diff --git a/patches/server/0865-Configurable-Region-Compression-Format.patch b/patches/server/0864-Configurable-Region-Compression-Format.patch
index 64a52a4ea2..64a52a4ea2 100644
--- a/patches/server/0865-Configurable-Region-Compression-Format.patch
+++ b/patches/server/0864-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0866-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0865-Add-BlockFace-to-BlockDamageEvent.patch
index 749d93224e..749d93224e 100644
--- a/patches/server/0866-Add-BlockFace-to-BlockDamageEvent.patch
+++ b/patches/server/0865-Add-BlockFace-to-BlockDamageEvent.patch
diff --git a/patches/server/0867-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0866-Fix-NPE-on-Boat-getStatus.patch
index 70323a4352..70323a4352 100644
--- a/patches/server/0867-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/server/0866-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0868-Expand-Pose-API.patch b/patches/server/0867-Expand-Pose-API.patch
index 1a9699d342..1a9699d342 100644
--- a/patches/server/0868-Expand-Pose-API.patch
+++ b/patches/server/0867-Expand-Pose-API.patch
diff --git a/patches/server/0869-More-DragonBattle-API.patch b/patches/server/0868-More-DragonBattle-API.patch
index b7b58f6c99..b7b58f6c99 100644
--- a/patches/server/0869-More-DragonBattle-API.patch
+++ b/patches/server/0868-More-DragonBattle-API.patch
diff --git a/patches/server/0870-Add-PlayerPickItemEvent.patch b/patches/server/0869-Add-PlayerPickItemEvent.patch
index b2bfa9ea75..b2bfa9ea75 100644
--- a/patches/server/0870-Add-PlayerPickItemEvent.patch
+++ b/patches/server/0869-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/0871-Allow-trident-custom-damage.patch b/patches/server/0870-Allow-trident-custom-damage.patch
index 95137bd7d5..95137bd7d5 100644
--- a/patches/server/0871-Allow-trident-custom-damage.patch
+++ b/patches/server/0870-Allow-trident-custom-damage.patch
diff --git a/patches/server/0872-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0871-Expose-hand-in-BlockCanBuildEvent.patch
index 4abc7e9fc5..4abc7e9fc5 100644
--- a/patches/server/0872-Expose-hand-in-BlockCanBuildEvent.patch
+++ b/patches/server/0871-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0873-Optimize-nearest-structure-border-iteration.patch b/patches/server/0872-Optimize-nearest-structure-border-iteration.patch
index df5f60c52c..df5f60c52c 100644
--- a/patches/server/0873-Optimize-nearest-structure-border-iteration.patch
+++ b/patches/server/0872-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0874-Implement-OfflinePlayer-isConnected.patch b/patches/server/0873-Implement-OfflinePlayer-isConnected.patch
index 1543a8e3ea..199101506f 100644
--- a/patches/server/0874-Implement-OfflinePlayer-isConnected.patch
+++ b/patches/server/0873-Implement-OfflinePlayer-isConnected.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement OfflinePlayer#isConnected
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index 4d654c4f0b6210a9841427789ba70ce5d1d308be..9d93130f23addb18b97d7f5ec013faef17a74529 100644
+index 2c2c4db31a746b4eb853dc04c6b3e5631bbfa034..4f4e3ee18d586f61706504218cddc06a38ca5580 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -54,6 +54,13 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
diff --git a/patches/server/0875-Fix-slot-desync.patch b/patches/server/0874-Fix-slot-desync.patch
index aa5a024985..aa5a024985 100644
--- a/patches/server/0875-Fix-slot-desync.patch
+++ b/patches/server/0874-Fix-slot-desync.patch
diff --git a/patches/server/0876-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0875-Add-titleOverride-to-InventoryOpenEvent.patch
index ee17679934..ee17679934 100644
--- a/patches/server/0876-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/server/0875-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/0877-Configure-sniffer-egg-hatch-time.patch b/patches/server/0876-Configure-sniffer-egg-hatch-time.patch
index 7def55b1f7..7def55b1f7 100644
--- a/patches/server/0877-Configure-sniffer-egg-hatch-time.patch
+++ b/patches/server/0876-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0878-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0877-Do-crystal-portal-proximity-check-before-entity-look.patch
index ee3855f2b8..ee3855f2b8 100644
--- a/patches/server/0878-Do-crystal-portal-proximity-check-before-entity-look.patch
+++ b/patches/server/0877-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/0879-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0878-Skip-POI-finding-if-stuck-in-vehicle.patch
index a4dcac44ac..a4dcac44ac 100644
--- a/patches/server/0879-Skip-POI-finding-if-stuck-in-vehicle.patch
+++ b/patches/server/0878-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0880-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0879-Add-slot-sanity-checks-in-container-clicks.patch
index 3be07bcfa2..3be07bcfa2 100644
--- a/patches/server/0880-Add-slot-sanity-checks-in-container-clicks.patch
+++ b/patches/server/0879-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/0881-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0880-Call-BlockRedstoneEvents-for-lecterns.patch
index 2c76754071..2c76754071 100644
--- a/patches/server/0881-Call-BlockRedstoneEvents-for-lecterns.patch
+++ b/patches/server/0880-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/0882-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0881-Allow-proper-checking-of-empty-item-stacks.patch
index c578a2c3c2..c578a2c3c2 100644
--- a/patches/server/0882-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/server/0881-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/0883-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0882-Fix-silent-equipment-change-for-mobs.patch
index 793470108f..793470108f 100644
--- a/patches/server/0883-Fix-silent-equipment-change-for-mobs.patch
+++ b/patches/server/0882-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/0884-Fix-spigot-s-Forced-Stats.patch b/patches/server/0883-Fix-spigot-s-Forced-Stats.patch
index 554f1f8844..554f1f8844 100644
--- a/patches/server/0884-Fix-spigot-s-Forced-Stats.patch
+++ b/patches/server/0883-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0885-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0884-Add-missing-InventoryHolders-to-inventories.patch
index d058564174..d058564174 100644
--- a/patches/server/0885-Add-missing-InventoryHolders-to-inventories.patch
+++ b/patches/server/0884-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/0886-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0885-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
index ab4d61b97a..ab4d61b97a 100644
--- a/patches/server/0886-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
+++ b/patches/server/0885-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/0887-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0886-Add-missing-logs-for-log-ips-config-option.patch
index 2898d66615..2898d66615 100644
--- a/patches/server/0887-Add-missing-logs-for-log-ips-config-option.patch
+++ b/patches/server/0886-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0888-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0887-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
index e1f2934daa..e1f2934daa 100644
--- a/patches/server/0888-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
+++ b/patches/server/0887-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0889-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0888-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
index 7ccf4c0f03..7ccf4c0f03 100644
--- a/patches/server/0889-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
+++ b/patches/server/0888-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/0890-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0889-Fix-team-sidebar-objectives-not-being-cleared.patch
index 88a39d0b20..88a39d0b20 100644
--- a/patches/server/0890-Fix-team-sidebar-objectives-not-being-cleared.patch
+++ b/patches/server/0889-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/0891-Fix-missing-map-initialize-event-call.patch b/patches/server/0890-Fix-missing-map-initialize-event-call.patch
index c95f6abbf7..c95f6abbf7 100644
--- a/patches/server/0891-Fix-missing-map-initialize-event-call.patch
+++ b/patches/server/0890-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/0892-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0891-Update-entity-data-when-attaching-firework-to-entity.patch
index f2c094976f..f2c094976f 100644
--- a/patches/server/0892-Update-entity-data-when-attaching-firework-to-entity.patch
+++ b/patches/server/0891-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/0893-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0892-Fix-UnsafeValues-loadAdvancement.patch
index c1cfc35cc9..c1cfc35cc9 100644
--- a/patches/server/0893-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/server/0892-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/0894-Add-player-idle-duration-API.patch b/patches/server/0893-Add-player-idle-duration-API.patch
index 0713bbba0b..0713bbba0b 100644
--- a/patches/server/0894-Add-player-idle-duration-API.patch
+++ b/patches/server/0893-Add-player-idle-duration-API.patch
diff --git a/patches/server/0895-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0894-Don-t-check-if-we-can-see-non-visible-entities.patch
index 5d9fbe505f..5d9fbe505f 100644
--- a/patches/server/0895-Don-t-check-if-we-can-see-non-visible-entities.patch
+++ b/patches/server/0894-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/0896-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0895-Fix-NPE-in-SculkBloomEvent-world-access.patch
index 5abf7cda2c..5abf7cda2c 100644
--- a/patches/server/0896-Fix-NPE-in-SculkBloomEvent-world-access.patch
+++ b/patches/server/0895-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/0897-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0896-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
index 6839ae5814..6839ae5814 100644
--- a/patches/server/0897-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
+++ b/patches/server/0896-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
diff --git a/patches/server/0898-Optimize-VarInts.patch b/patches/server/0897-Optimize-VarInts.patch
index b96957d432..b96957d432 100644
--- a/patches/server/0898-Optimize-VarInts.patch
+++ b/patches/server/0897-Optimize-VarInts.patch
diff --git a/patches/server/0899-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0898-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index f0fcc8b9eb..f0fcc8b9eb 100644
--- a/patches/server/0899-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/server/0898-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/0900-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0899-Add-predicate-for-blocks-when-raytracing.patch
index 43a753b5c2..43a753b5c2 100644
--- a/patches/server/0900-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/server/0899-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/0901-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0900-Broadcast-take-item-packets-with-collector-as-source.patch
index 740ea621a7..740ea621a7 100644
--- a/patches/server/0901-Broadcast-take-item-packets-with-collector-as-source.patch
+++ b/patches/server/0900-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/0902-Expand-LingeringPotion-API.patch b/patches/server/0901-Expand-LingeringPotion-API.patch
index fdd0abf668..fdd0abf668 100644
--- a/patches/server/0902-Expand-LingeringPotion-API.patch
+++ b/patches/server/0901-Expand-LingeringPotion-API.patch
diff --git a/patches/server/0903-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0902-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
index da48750747..da48750747 100644
--- a/patches/server/0903-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
+++ b/patches/server/0902-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/0904-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0903-Add-hand-to-fish-event-for-all-player-interactions.patch
index dd3e5bba44..dd3e5bba44 100644
--- a/patches/server/0904-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/server/0903-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/0905-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0904-Fix-several-issues-with-EntityBreedEvent.patch
index 6a97d9fb9e..6a97d9fb9e 100644
--- a/patches/server/0905-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/server/0904-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/0906-Add-UUID-attribute-modifier-API.patch b/patches/server/0905-Add-UUID-attribute-modifier-API.patch
index 4b5e695553..4b5e695553 100644
--- a/patches/server/0906-Add-UUID-attribute-modifier-API.patch
+++ b/patches/server/0905-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/0907-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0906-Fix-missing-event-call-for-entity-teleport-API.patch
index d567759368..d567759368 100644
--- a/patches/server/0907-Fix-missing-event-call-for-entity-teleport-API.patch
+++ b/patches/server/0906-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/0908-Lazily-create-LootContext-for-criterions.patch b/patches/server/0907-Lazily-create-LootContext-for-criterions.patch
index d1033bf7e7..d1033bf7e7 100644
--- a/patches/server/0908-Lazily-create-LootContext-for-criterions.patch
+++ b/patches/server/0907-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/0909-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0908-Don-t-fire-sync-events-during-worldgen.patch
index 6d438fe4c5..6d438fe4c5 100644
--- a/patches/server/0909-Don-t-fire-sync-events-during-worldgen.patch
+++ b/patches/server/0908-Don-t-fire-sync-events-during-worldgen.patch
diff --git a/patches/server/0910-Add-Structure-check-API.patch b/patches/server/0909-Add-Structure-check-API.patch
index 6f901b1c7f..6f901b1c7f 100644
--- a/patches/server/0910-Add-Structure-check-API.patch
+++ b/patches/server/0909-Add-Structure-check-API.patch
diff --git a/patches/server/0911-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0910-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
index 32e393d2a8..32e393d2a8 100644
--- a/patches/server/0911-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
+++ b/patches/server/0910-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/0912-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0911-Restore-vanilla-entity-drops-behavior.patch
index 9fd6b370b4..7636320903 100644
--- a/patches/server/0912-Restore-vanilla-entity-drops-behavior.patch
+++ b/patches/server/0911-Restore-vanilla-entity-drops-behavior.patch
@@ -152,7 +152,7 @@ index 5bcb9a53ebebeef4bd6ec2458df4b63002ebd804..2f398750bfee5758ad8b1367b6fc1436
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 2690c471b819f8308f6db44150025dfa323d4e0c..0d6cdb6b0dfd84f619a5e43150165b4606a96bcd 100644
+index 2690c471b819f8308f6db44150025dfa323d4e0c..f529243852df8e193a604bb6d895333848b14a74 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -975,18 +975,24 @@ public class CraftEventFactory {
diff --git a/patches/server/0913-Dont-resend-blocks-on-interactions.patch b/patches/server/0912-Dont-resend-blocks-on-interactions.patch
index f349629dd4..74650cebfd 100644
--- a/patches/server/0913-Dont-resend-blocks-on-interactions.patch
+++ b/patches/server/0912-Dont-resend-blocks-on-interactions.patch
@@ -149,7 +149,7 @@ index 6caed156ed0cfe0017d578f58cb963ee68272d78..321188173918d0d60858a258400dfd68
                      return false;
                  }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 355e461da5551e38bbc2ede69c5818f7db27011c..abacf779b3eb2de126137d3c4166a7fc648b291c 100644
+index 87cae96faf33fa0491b13add79e02fc225bd2f70..e9a9c89bd6a4ce7cb30c2fcf79a537fc18204aeb 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -500,10 +500,12 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0914-add-more-scoreboard-API.patch b/patches/server/0913-add-more-scoreboard-API.patch
index 3365b53a36..3365b53a36 100644
--- a/patches/server/0914-add-more-scoreboard-API.patch
+++ b/patches/server/0913-add-more-scoreboard-API.patch
diff --git a/patches/server/0915-Improve-Registry.patch b/patches/server/0914-Improve-Registry.patch
index bd6287869d..bd6287869d 100644
--- a/patches/server/0915-Improve-Registry.patch
+++ b/patches/server/0914-Improve-Registry.patch
diff --git a/patches/server/0916-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0915-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
index d0dc04a7eb..d0dc04a7eb 100644
--- a/patches/server/0916-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
+++ b/patches/server/0915-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
diff --git a/patches/server/0917-Add-experience-points-API.patch b/patches/server/0916-Add-experience-points-API.patch
index fc30446016..fc30446016 100644
--- a/patches/server/0917-Add-experience-points-API.patch
+++ b/patches/server/0916-Add-experience-points-API.patch
diff --git a/patches/server/0918-Add-drops-to-shear-events.patch b/patches/server/0917-Add-drops-to-shear-events.patch
index 87f104d00d..7e5645cd5f 100644
--- a/patches/server/0918-Add-drops-to-shear-events.patch
+++ b/patches/server/0917-Add-drops-to-shear-events.patch
@@ -317,7 +317,7 @@ index dc6230458e09f7555eee7f6a567ff60ad454666b..9d50b9ac8084f3db1844cc7ad1ce9153
      public boolean readyForShearing() {
          return !this.isSheared() && this.isAlive();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 0d6cdb6b0dfd84f619a5e43150165b4606a96bcd..d4c809649ff84ac953c0c93fc7031a27d235b72c 100644
+index f529243852df8e193a604bb6d895333848b14a74..d407e9e8f1b530f00e632e0249514fb68d48316b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1691,20 +1691,20 @@ public class CraftEventFactory {
diff --git a/patches/server/0919-Add-PlayerShieldDisableEvent.patch b/patches/server/0918-Add-PlayerShieldDisableEvent.patch
index 5bbd9b6ff6..5bbd9b6ff6 100644
--- a/patches/server/0919-Add-PlayerShieldDisableEvent.patch
+++ b/patches/server/0918-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/server/0920-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0919-Validate-ResourceLocation-in-NBT-reading.patch
index 48e7f7dede..48e7f7dede 100644
--- a/patches/server/0920-Validate-ResourceLocation-in-NBT-reading.patch
+++ b/patches/server/0919-Validate-ResourceLocation-in-NBT-reading.patch
diff --git a/patches/server/0921-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0920-Properly-handle-experience-dropping-on-block-break.patch
index c5ffca5d89..c5ffca5d89 100644
--- a/patches/server/0921-Properly-handle-experience-dropping-on-block-break.patch
+++ b/patches/server/0920-Properly-handle-experience-dropping-on-block-break.patch
diff --git a/patches/server/0922-Fixup-NamespacedKey-handling.patch b/patches/server/0921-Fixup-NamespacedKey-handling.patch
index f5d990944b..f5d990944b 100644
--- a/patches/server/0922-Fixup-NamespacedKey-handling.patch
+++ b/patches/server/0921-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/0923-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0922-Expose-LootTable-of-DecoratedPot.patch
index afa86977a9..afa86977a9 100644
--- a/patches/server/0923-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/server/0922-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/server/0924-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0923-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
index 37c0ef0eef..37c0ef0eef 100644
--- a/patches/server/0924-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
+++ b/patches/server/0923-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0925-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0924-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
index 95e1104a25..95e1104a25 100644
--- a/patches/server/0925-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
+++ b/patches/server/0924-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0926-Add-ShulkerDuplicateEvent.patch b/patches/server/0925-Add-ShulkerDuplicateEvent.patch
index de864137e2..de864137e2 100644
--- a/patches/server/0926-Add-ShulkerDuplicateEvent.patch
+++ b/patches/server/0925-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/server/0927-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/0926-Add-api-for-spawn-egg-texture-colors.patch
index f8a65ad281..f8a65ad281 100644
--- a/patches/server/0927-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/server/0926-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/server/0928-Add-Lifecycle-Event-system.patch b/patches/server/0927-Add-Lifecycle-Event-system.patch
index 8cd7f2852f..8cd7f2852f 100644
--- a/patches/server/0928-Add-Lifecycle-Event-system.patch
+++ b/patches/server/0927-Add-Lifecycle-Event-system.patch
diff --git a/patches/server/0929-ItemStack-Tooltip-API.patch b/patches/server/0928-ItemStack-Tooltip-API.patch
index bdec7c8b91..bdec7c8b91 100644
--- a/patches/server/0929-ItemStack-Tooltip-API.patch
+++ b/patches/server/0928-ItemStack-Tooltip-API.patch
diff --git a/patches/server/0930-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/0929-Add-getChunkSnapshot-includeLightData-parameter.patch
index 54aa35539f..54aa35539f 100644
--- a/patches/server/0930-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/server/0929-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/server/0931-Add-FluidState-API.patch b/patches/server/0930-Add-FluidState-API.patch
index aac0912819..aac0912819 100644
--- a/patches/server/0931-Add-FluidState-API.patch
+++ b/patches/server/0930-Add-FluidState-API.patch
diff --git a/patches/server/0932-add-number-format-api.patch b/patches/server/0931-add-number-format-api.patch
index d412b5f929..d412b5f929 100644
--- a/patches/server/0932-add-number-format-api.patch
+++ b/patches/server/0931-add-number-format-api.patch
diff --git a/patches/server/0933-improve-BanList-types.patch b/patches/server/0932-improve-BanList-types.patch
index 23a08cbe55..23a08cbe55 100644
--- a/patches/server/0933-improve-BanList-types.patch
+++ b/patches/server/0932-improve-BanList-types.patch
diff --git a/patches/server/0934-Expanded-Hopper-API.patch b/patches/server/0933-Expanded-Hopper-API.patch
index 2b59ac9974..2b59ac9974 100644
--- a/patches/server/0934-Expanded-Hopper-API.patch
+++ b/patches/server/0933-Expanded-Hopper-API.patch
diff --git a/patches/server/0935-Add-BlockBreakProgressUpdateEvent.patch b/patches/server/0934-Add-BlockBreakProgressUpdateEvent.patch
index 3481a288ee..3481a288ee 100644
--- a/patches/server/0935-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/server/0934-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/server/0936-Deprecate-ItemStack-setType.patch b/patches/server/0935-Deprecate-ItemStack-setType.patch
index e0a6acc747..e0a6acc747 100644
--- a/patches/server/0936-Deprecate-ItemStack-setType.patch
+++ b/patches/server/0935-Deprecate-ItemStack-setType.patch
diff --git a/patches/server/0937-Add-CartographyItemEvent.patch b/patches/server/0936-Add-CartographyItemEvent.patch
index 9e48767381..9e48767381 100644
--- a/patches/server/0937-Add-CartographyItemEvent.patch
+++ b/patches/server/0936-Add-CartographyItemEvent.patch
diff --git a/patches/server/0938-More-Raid-API.patch b/patches/server/0937-More-Raid-API.patch
index e218d301b5..e218d301b5 100644
--- a/patches/server/0938-More-Raid-API.patch
+++ b/patches/server/0937-More-Raid-API.patch
diff --git a/patches/server/0939-Add-onboarding-message-for-initial-server-start.patch b/patches/server/0938-Add-onboarding-message-for-initial-server-start.patch
index d3fb21c7a3..5bb4e9d2fc 100644
--- a/patches/server/0939-Add-onboarding-message-for-initial-server-start.patch
+++ b/patches/server/0938-Add-onboarding-message-for-initial-server-start.patch
@@ -29,10 +29,10 @@ index 917bd0c1dd8f356edc3741ee59d24e4d090af182..f19b4a17a7e22969f7b51d3bea4056b4
          return instance;
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2dfa9c4c0c2ef489649944eed89d8c77c482b92f..e055769071841d56ec7e2a64fc519d1f8b48ff42 100644
+index 3ee0e2adf576e312c18da90adc46160ad85179fb..42a74f5471da882d63c194b1e212f78a94b103ec 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1136,6 +1136,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1135,6 +1135,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              long tickSection = Util.getNanos();
              long currentTime;
              // Paper end - further improve server tick loop
diff --git a/patches/server/0940-Configurable-max-block-fluid-ticks.patch b/patches/server/0939-Configurable-max-block-fluid-ticks.patch
index 2d7a50b998..2d7a50b998 100644
--- a/patches/server/0940-Configurable-max-block-fluid-ticks.patch
+++ b/patches/server/0939-Configurable-max-block-fluid-ticks.patch
diff --git a/patches/server/0941-Fix-bees-aging-inside-hives.patch b/patches/server/0940-Fix-bees-aging-inside-hives.patch
index 400ede1160..400ede1160 100644
--- a/patches/server/0941-Fix-bees-aging-inside-hives.patch
+++ b/patches/server/0940-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0942-Disable-memory-reserve-allocating.patch b/patches/server/0941-Disable-memory-reserve-allocating.patch
index ea801f5092..ea801f5092 100644
--- a/patches/server/0942-Disable-memory-reserve-allocating.patch
+++ b/patches/server/0941-Disable-memory-reserve-allocating.patch
diff --git a/patches/server/0943-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/0942-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
index d98b3aeccc..d98b3aeccc 100644
--- a/patches/server/0943-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
+++ b/patches/server/0942-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
diff --git a/patches/server/0944-Fix-DamageSource-API.patch b/patches/server/0943-Fix-DamageSource-API.patch
index def13cd0ba..f92badc241 100644
--- a/patches/server/0944-Fix-DamageSource-API.patch
+++ b/patches/server/0943-Fix-DamageSource-API.patch
@@ -84,7 +84,7 @@ index caf1d79e2bbdd257a5439e2973653747e678805f..e34584e4780f343d6c946af5377088d5
  
      public DamageSource sonicBoom(Entity attacker) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 57e7938bc605f320ed5303fcbc617b4d32ba42b8..ef05c75d86ce3a7e4d4438dcd6f98c778568634a 100644
+index e88c88b6f87dddda8e8e3ed215a8f2c166afa3ef..62ef618aff33c98f96d0271bb2ab42235c941052 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3262,7 +3262,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -220,7 +220,7 @@ index 4c6e15535fa40aad8cf1920f392589404f9ba79c..35eb95ef6fb6a0f7ea63351e90741c48
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index d4c809649ff84ac953c0c93fc7031a27d235b72c..4432592de42df9c5a1851ec7430a14afc8ec5647 100644
+index d407e9e8f1b530f00e632e0249514fb68d48316b..1b21fdab4269df375d2f445df3bd56f7b1fd2b15 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1094,7 +1094,7 @@ public class CraftEventFactory {
diff --git a/patches/server/0945-Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/server/0944-Fix-creation-of-invalid-block-entity-during-world-ge.patch
index 8e09c4fb05..8e09c4fb05 100644
--- a/patches/server/0945-Fix-creation-of-invalid-block-entity-during-world-ge.patch
+++ b/patches/server/0944-Fix-creation-of-invalid-block-entity-during-world-ge.patch
diff --git a/patches/server/0946-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/0945-Fix-possible-StackOverflowError-for-some-dispenses.patch
index 5351dde83c..5351dde83c 100644
--- a/patches/server/0946-Fix-possible-StackOverflowError-for-some-dispenses.patch
+++ b/patches/server/0945-Fix-possible-StackOverflowError-for-some-dispenses.patch
diff --git a/patches/server/0947-Improve-tag-parser-handling.patch b/patches/server/0946-Improve-tag-parser-handling.patch
index 9ffa70e388..9ffa70e388 100644
--- a/patches/server/0947-Improve-tag-parser-handling.patch
+++ b/patches/server/0946-Improve-tag-parser-handling.patch
diff --git a/patches/server/0948-Item-Mutation-Fixes.patch b/patches/server/0947-Item-Mutation-Fixes.patch
index bad3be61f9..bad3be61f9 100644
--- a/patches/server/0948-Item-Mutation-Fixes.patch
+++ b/patches/server/0947-Item-Mutation-Fixes.patch
diff --git a/patches/server/0949-Per-world-ticks-per-spawn-settings.patch b/patches/server/0948-Per-world-ticks-per-spawn-settings.patch
index 0d7c9ea5b4..0d7c9ea5b4 100644
--- a/patches/server/0949-Per-world-ticks-per-spawn-settings.patch
+++ b/patches/server/0948-Per-world-ticks-per-spawn-settings.patch
diff --git a/patches/server/0950-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/0949-Properly-track-the-changed-item-from-dispense-events.patch
index 2dc797fea7..2dc797fea7 100644
--- a/patches/server/0950-Properly-track-the-changed-item-from-dispense-events.patch
+++ b/patches/server/0949-Properly-track-the-changed-item-from-dispense-events.patch
diff --git a/patches/server/0951-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0950-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
index 12dc4db2ff..12dc4db2ff 100644
--- a/patches/server/0951-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
+++ b/patches/server/0950-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0952-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/0951-Fix-tripwire-disarming-not-working-as-intended.patch
index fa7f6bde06..fa7f6bde06 100644
--- a/patches/server/0952-Fix-tripwire-disarming-not-working-as-intended.patch
+++ b/patches/server/0951-Fix-tripwire-disarming-not-working-as-intended.patch
diff --git a/patches/server/0953-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0952-Add-config-for-mobs-immune-to-default-effects.patch
index 74dd1a1360..74dd1a1360 100644
--- a/patches/server/0953-Add-config-for-mobs-immune-to-default-effects.patch
+++ b/patches/server/0952-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0954-Deep-clone-nbt-tags-in-PDC.patch b/patches/server/0953-Deep-clone-nbt-tags-in-PDC.patch
index f559f0cd9d..f559f0cd9d 100644
--- a/patches/server/0954-Deep-clone-nbt-tags-in-PDC.patch
+++ b/patches/server/0953-Deep-clone-nbt-tags-in-PDC.patch
diff --git a/patches/server/0955-Support-old-UUID-format-for-NBT.patch b/patches/server/0954-Support-old-UUID-format-for-NBT.patch
index 68ff8a5255..68ff8a5255 100644
--- a/patches/server/0955-Support-old-UUID-format-for-NBT.patch
+++ b/patches/server/0954-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0956-Fix-shield-disable-inconsistency.patch b/patches/server/0955-Fix-shield-disable-inconsistency.patch
index 61614305d9..61614305d9 100644
--- a/patches/server/0956-Fix-shield-disable-inconsistency.patch
+++ b/patches/server/0955-Fix-shield-disable-inconsistency.patch
diff --git a/patches/server/0957-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0956-Handle-Large-Packets-disconnecting-client.patch
index ea20a101a7..ea20a101a7 100644
--- a/patches/server/0957-Handle-Large-Packets-disconnecting-client.patch
+++ b/patches/server/0956-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0958-Fix-ItemFlags.patch b/patches/server/0957-Fix-ItemFlags.patch
index 46e55a9780..46e55a9780 100644
--- a/patches/server/0958-Fix-ItemFlags.patch
+++ b/patches/server/0957-Fix-ItemFlags.patch
diff --git a/patches/server/0959-Fix-helmet-damage-reduction-inconsistencies.patch b/patches/server/0958-Fix-helmet-damage-reduction-inconsistencies.patch
index daa60965af..a8b503a8ea 100644
--- a/patches/server/0959-Fix-helmet-damage-reduction-inconsistencies.patch
+++ b/patches/server/0958-Fix-helmet-damage-reduction-inconsistencies.patch
@@ -7,7 +7,7 @@ Affect the falling stalactite damage type where the
 reduction is not applied like in Vanilla
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 4432592de42df9c5a1851ec7430a14afc8ec5647..965ae1de419995a829a13f35c25a51c2e2bac135 100644
+index 1b21fdab4269df375d2f445df3bd56f7b1fd2b15..4632eb883e9f5efde520ee543bcad25827c0da2c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1228,7 +1228,7 @@ public class CraftEventFactory {
diff --git a/patches/server/0960-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/server/0959-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
index 2965a66127..2965a66127 100644
--- a/patches/server/0960-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
+++ b/patches/server/0959-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
diff --git a/patches/server/0961-improve-checking-handled-tags-in-itemmeta.patch b/patches/server/0960-improve-checking-handled-tags-in-itemmeta.patch
index e6c75df87e..0d027cd582 100644
--- a/patches/server/0961-improve-checking-handled-tags-in-itemmeta.patch
+++ b/patches/server/0960-improve-checking-handled-tags-in-itemmeta.patch
@@ -729,7 +729,7 @@ index bcd6cc29e4e621805cbd923d747f652ced240c6d..967d8940aec0065bce496d5d7a8c73de
          getOrEmpty(tag, CraftMetaShield.BASE_COLOR).ifPresent((color) -> {
              this.banner = CraftMetaShield.getBlockState(DyeColor.getByWoolData((byte) color.getId()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index 0b680f4d79e9d04b755309ac46969d7e43fd3c5f..213bc163daeb98d2d5cfaf02e18688c65c5d219c 100644
+index ca714e165e453d1072d083441d8b985290ada75a..302906467b12189e21633369c005736863f46dd5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -48,8 +48,8 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
diff --git a/patches/server/0962-General-ItemMeta-fixes.patch b/patches/server/0961-General-ItemMeta-fixes.patch
index c16ea28c5e..c16ea28c5e 100644
--- a/patches/server/0962-General-ItemMeta-fixes.patch
+++ b/patches/server/0961-General-ItemMeta-fixes.patch
diff --git a/patches/server/0963-Expose-hasColor-to-leather-armor.patch b/patches/server/0962-Expose-hasColor-to-leather-armor.patch
index fb4dc944de..fb4dc944de 100644
--- a/patches/server/0963-Expose-hasColor-to-leather-armor.patch
+++ b/patches/server/0962-Expose-hasColor-to-leather-armor.patch
diff --git a/patches/server/0964-Added-API-to-get-player-ha-proxy-address.patch b/patches/server/0963-Added-API-to-get-player-ha-proxy-address.patch
index 3f8c3f63b4..3f8c3f63b4 100644
--- a/patches/server/0964-Added-API-to-get-player-ha-proxy-address.patch
+++ b/patches/server/0963-Added-API-to-get-player-ha-proxy-address.patch
diff --git a/patches/server/0965-More-Chest-Block-API.patch b/patches/server/0964-More-Chest-Block-API.patch
index 020d97d086..020d97d086 100644
--- a/patches/server/0965-More-Chest-Block-API.patch
+++ b/patches/server/0964-More-Chest-Block-API.patch
diff --git a/patches/server/0966-Print-data-component-type-on-encoding-error.patch b/patches/server/0965-Print-data-component-type-on-encoding-error.patch
index a60bdfee87..a60bdfee87 100644
--- a/patches/server/0966-Print-data-component-type-on-encoding-error.patch
+++ b/patches/server/0965-Print-data-component-type-on-encoding-error.patch
diff --git a/patches/server/0967-Brigadier-based-command-API.patch b/patches/server/0966-Brigadier-based-command-API.patch
index 8f0836b78a..876063208b 100644
--- a/patches/server/0967-Brigadier-based-command-API.patch
+++ b/patches/server/0966-Brigadier-based-command-API.patch
@@ -2242,7 +2242,7 @@ index 55484826fc5ddd04ae024e25a0251796d7fa9c28..237e4f7b24908e9ade9a483eb7ae05fa
          Component component = message.resolveComponent(commandSourceStack);
          CommandSigningContext commandSigningContext = commandSourceStack.getSigningContext();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e055769071841d56ec7e2a64fc519d1f8b48ff42..c97fb8eec949c693d4e822d8cf2e666a0858f20c 100644
+index 42a74f5471da882d63c194b1e212f78a94b103ec..a093f29a0b75b5a9e2db2238698d2f3f4ac14ed1 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -306,7 +306,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2254,7 +2254,7 @@ index e055769071841d56ec7e2a64fc519d1f8b48ff42..c97fb8eec949c693d4e822d8cf2e666a
      private boolean forceTicks;
      // CraftBukkit end
      // Spigot start
-@@ -393,7 +393,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -392,7 +392,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // CraftBukkit start
          this.options = options;
          this.worldLoader = worldLoader;
@@ -2262,7 +2262,7 @@ index e055769071841d56ec7e2a64fc519d1f8b48ff42..c97fb8eec949c693d4e822d8cf2e666a
          // Paper start - Handled by TerminalConsoleAppender
          // Try to see if we're actually running in a terminal, disable jline if not
          /*
-@@ -678,6 +677,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -677,6 +676,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD);
          if (io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper != null) io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper.pluginsEnabled(); // Paper - Remap plugins
@@ -2272,7 +2272,7 @@ index e055769071841d56ec7e2a64fc519d1f8b48ff42..c97fb8eec949c693d4e822d8cf2e666a
          this.server.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.STARTUP));
          this.connection.acceptConnections();
      }
-@@ -2181,9 +2183,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2179,9 +2181,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  return new MinecraftServer.ReloadableResources(resourcemanager, datapackresources);
              });
          }).thenAcceptAsync((minecraftserver_reloadableresources) -> {
@@ -2283,7 +2283,7 @@ index e055769071841d56ec7e2a64fc519d1f8b48ff42..c97fb8eec949c693d4e822d8cf2e666a
              this.packRepository.setSelected(dataPacks);
              WorldDataConfiguration worlddataconfiguration = new WorldDataConfiguration(MinecraftServer.getSelectedPacks(this.packRepository, true), this.worldData.enabledFeatures());
  
-@@ -2194,8 +2196,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2192,8 +2194,17 @@ 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/0968-Fix-issues-with-Recipe-API.patch b/patches/server/0967-Fix-issues-with-Recipe-API.patch
index bb85dca687..bb85dca687 100644
--- a/patches/server/0968-Fix-issues-with-Recipe-API.patch
+++ b/patches/server/0967-Fix-issues-with-Recipe-API.patch
diff --git a/patches/server/0969-Fix-equipment-slot-and-group-API.patch b/patches/server/0968-Fix-equipment-slot-and-group-API.patch
index e84bebe105..e84bebe105 100644
--- a/patches/server/0969-Fix-equipment-slot-and-group-API.patch
+++ b/patches/server/0968-Fix-equipment-slot-and-group-API.patch
diff --git a/patches/server/0970-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/server/0969-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
index 8b39d13b43..8b39d13b43 100644
--- a/patches/server/0970-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
+++ b/patches/server/0969-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
diff --git a/patches/server/0971-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0970-Prevent-sending-oversized-item-data-in-equipment-and.patch
index 121b75eca6..121b75eca6 100644
--- a/patches/server/0971-Prevent-sending-oversized-item-data-in-equipment-and.patch
+++ b/patches/server/0970-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0972-Prevent-NPE-if-hooked-entity-was-cleared.patch b/patches/server/0971-Prevent-NPE-if-hooked-entity-was-cleared.patch
index 8d3547db93..8d3547db93 100644
--- a/patches/server/0972-Prevent-NPE-if-hooked-entity-was-cleared.patch
+++ b/patches/server/0971-Prevent-NPE-if-hooked-entity-was-cleared.patch
diff --git a/patches/server/0973-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch b/patches/server/0972-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
index 35a252aaeb..cee7f11394 100644
--- a/patches/server/0973-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
+++ b/patches/server/0972-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix cancelling BlockPlaceEvent calling onRemove
 
 
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index dc74f690afcf12a1e3410f4504d3f78303394ea7..66047f876aedbcc33b86b5cfe2ace588523eb810 100644
+index 58786dd7b51d17c1b602756c4c44840ab75ad0a7..96b24c1415af531feef7d8ab4724f7fed3ae8388 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -494,9 +494,11 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/0974-Add-missing-fishing-event-state.patch b/patches/server/0973-Add-missing-fishing-event-state.patch
index 6ad1a92dd0..6ad1a92dd0 100644
--- a/patches/server/0974-Add-missing-fishing-event-state.patch
+++ b/patches/server/0973-Add-missing-fishing-event-state.patch
diff --git a/patches/server/0975-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/server/0974-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
index 23a507f4bf..23a507f4bf 100644
--- a/patches/server/0975-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
+++ b/patches/server/0974-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
diff --git a/patches/server/0976-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch b/patches/server/0975-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
index 1abf467e7e..1abf467e7e 100644
--- a/patches/server/0976-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
+++ b/patches/server/0975-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
diff --git a/patches/server/0977-Adopt-MaterialRerouting.patch b/patches/server/0976-Adopt-MaterialRerouting.patch
index e6473ef21a..e6473ef21a 100644
--- a/patches/server/0977-Adopt-MaterialRerouting.patch
+++ b/patches/server/0976-Adopt-MaterialRerouting.patch
diff --git a/patches/server/0978-Suspicious-Effect-Entry-API.patch b/patches/server/0977-Suspicious-Effect-Entry-API.patch
index bc26031199..bc26031199 100644
--- a/patches/server/0978-Suspicious-Effect-Entry-API.patch
+++ b/patches/server/0977-Suspicious-Effect-Entry-API.patch
diff --git a/patches/server/0979-check-if-itemstack-is-stackable-first.patch b/patches/server/0978-check-if-itemstack-is-stackable-first.patch
index 8e11960bdd..8e11960bdd 100644
--- a/patches/server/0979-check-if-itemstack-is-stackable-first.patch
+++ b/patches/server/0978-check-if-itemstack-is-stackable-first.patch
diff --git a/patches/server/0980-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0979-Fix-removing-recipes-from-RecipeIterator.patch
index 461c3eb854..461c3eb854 100644
--- a/patches/server/0980-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0979-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0981-Configurable-damage-tick-when-blocking-with-shield.patch b/patches/server/0980-Configurable-damage-tick-when-blocking-with-shield.patch
index 7f58a8291d..7f58a8291d 100644
--- a/patches/server/0981-Configurable-damage-tick-when-blocking-with-shield.patch
+++ b/patches/server/0980-Configurable-damage-tick-when-blocking-with-shield.patch
diff --git a/patches/server/0982-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/server/0981-Properly-remove-the-experimental-smithing-inventory-.patch
index 9ede88caa7..9ede88caa7 100644
--- a/patches/server/0982-Properly-remove-the-experimental-smithing-inventory-.patch
+++ b/patches/server/0981-Properly-remove-the-experimental-smithing-inventory-.patch
diff --git a/patches/server/0983-Moonrise-optimisation-patches.patch b/patches/server/0982-Moonrise-optimisation-patches.patch
index 96ac319108..9bafe4f99f 100644
--- a/patches/server/0983-Moonrise-optimisation-patches.patch
+++ b/patches/server/0982-Moonrise-optimisation-patches.patch
@@ -22434,7 +22434,7 @@ index c33f85b570f159ab465b5a10a8044a81f2797f43..244a19ecd0234fa1d7a6ecfea2075159
                  DedicatedServer dedicatedserver1 = new DedicatedServer(optionset, worldLoader.get(), thread, convertable_conversionsession, resourcepackrepository, worldstem, dedicatedserversettings, DataFixers.getDataFixer(), services, LoggerChunkProgressListener::createFromGameruleRadius);
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c97fb8eec949c693d4e822d8cf2e666a0858f20c..4a4ce372dd105d07f58d7d93d856cb3969969806 100644
+index a093f29a0b75b5a9e2db2238698d2f3f4ac14ed1..999e9c8f842423e6f1a3e80902e9d076e01f6694 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -198,7 +198,7 @@ import org.bukkit.event.server.ServerLoadEvent;
@@ -22446,7 +22446,7 @@ index c97fb8eec949c693d4e822d8cf2e666a0858f20c..4a4ce372dd105d07f58d7d93d856cb39
  
      private static MinecraftServer SERVER; // Paper
      public static final Logger LOGGER = LogUtils.getLogger();
-@@ -322,7 +322,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -321,7 +321,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
@@ -22455,7 +22455,7 @@ index c97fb8eec949c693d4e822d8cf2e666a0858f20c..4a4ce372dd105d07f58d7d93d856cb39
              ((MinecraftServer) atomicreference.get()).runServer();
          }, "Server thread");
  
-@@ -341,6 +341,77 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -340,6 +340,77 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          return s0;
      }
  
@@ -22533,7 +22533,7 @@ index c97fb8eec949c693d4e822d8cf2e666a0858f20c..4a4ce372dd105d07f58d7d93d856cb39
      public MinecraftServer(OptionSet options, WorldLoader.DataLoadContext worldLoader, Thread thread, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PackRepository resourcepackrepository, WorldStem worldstem, Proxy proxy, DataFixer datafixer, Services services, ChunkProgressListenerFactory worldloadlistenerfactory) {
          super("Server");
          SERVER = this; // Paper - better singleton
-@@ -657,7 +728,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -656,7 +727,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.forceDifficulty();
          for (ServerLevel worldserver : this.getAllLevels()) {
              this.prepareLevels(worldserver.getChunkSource().chunkMap.progressListener, worldserver);
@@ -22542,7 +22542,7 @@ index c97fb8eec949c693d4e822d8cf2e666a0858f20c..4a4ce372dd105d07f58d7d93d856cb39
              this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(worldserver.getWorld()));
          }
  
-@@ -870,6 +941,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -869,6 +940,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public abstract boolean shouldRconBroadcast();
  
      public boolean saveAllChunks(boolean suppressLogs, boolean flush, boolean force) {
@@ -22554,7 +22554,7 @@ index c97fb8eec949c693d4e822d8cf2e666a0858f20c..4a4ce372dd105d07f58d7d93d856cb39
          boolean flag3 = false;
  
          for (Iterator iterator = this.getAllLevels().iterator(); iterator.hasNext(); flag3 = true) {
-@@ -879,7 +955,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -878,7 +954,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  MinecraftServer.LOGGER.info("Saving chunks for level '{}'/{}", worldserver, worldserver.dimension().location());
              }
  
@@ -22563,7 +22563,7 @@ index c97fb8eec949c693d4e822d8cf2e666a0858f20c..4a4ce372dd105d07f58d7d93d856cb39
          }
  
          // CraftBukkit start - moved to WorldServer.save
-@@ -980,7 +1056,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -979,7 +1055,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              }
          }
  
@@ -22572,7 +22572,7 @@ index c97fb8eec949c693d4e822d8cf2e666a0858f20c..4a4ce372dd105d07f58d7d93d856cb39
              return worldserver1.getChunkSource().chunkMap.hasWork();
          })) {
              this.nextTickTimeNanos = Util.getNanos() + TimeUtil.NANOSECONDS_PER_MILLISECOND;
-@@ -997,19 +1073,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -996,19 +1072,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.waitUntilNextTick();
          }
  
@@ -22593,7 +22593,7 @@ index c97fb8eec949c693d4e822d8cf2e666a0858f20c..4a4ce372dd105d07f58d7d93d856cb39
  
          this.isSaving = false;
          this.resources.close();
-@@ -1029,6 +1093,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1028,6 +1092,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
          // Spigot end
  
@@ -22601,7 +22601,7 @@ index c97fb8eec949c693d4e822d8cf2e666a0858f20c..4a4ce372dd105d07f58d7d93d856cb39
      }
  
      public String getLocalIp() {
-@@ -1203,6 +1268,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1201,6 +1266,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  this.tickServer(flag ? () -> {
                      return false;
                  } : this::haveTime);
@@ -22615,7 +22615,7 @@ index c97fb8eec949c693d4e822d8cf2e666a0858f20c..4a4ce372dd105d07f58d7d93d856cb39
                  this.profiler.popPush("nextTickWait");
                  this.mayHaveDelayedTasks = true;
                  this.delayedTasksMaxNextTickTimeNanos = Math.max(Util.getNanos() + i, this.nextTickTimeNanos);
-@@ -1392,6 +1464,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1390,6 +1462,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      private boolean pollTaskInternal() {
          if (super.pollTask()) {
@@ -22623,7 +22623,7 @@ index c97fb8eec949c693d4e822d8cf2e666a0858f20c..4a4ce372dd105d07f58d7d93d856cb39
              return true;
          } else {
              boolean ret = false; // Paper - force execution of all worlds, do not just bias the first
-@@ -1593,7 +1666,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1591,7 +1664,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Paper start - Folia scheduler API
          ((io.papermc.paper.threadedregions.scheduler.FoliaGlobalRegionScheduler) Bukkit.getGlobalRegionScheduler()).tick();
          getAllLevels().forEach(level -> {
@@ -22632,7 +22632,7 @@ index c97fb8eec949c693d4e822d8cf2e666a0858f20c..4a4ce372dd105d07f58d7d93d856cb39
                  if (entity.isRemoved()) {
                      continue;
                  }
-@@ -2655,6 +2728,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2653,6 +2726,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      }
  
@@ -26935,7 +26935,7 @@ index 50040c497a819cd1229042ab3cb057d34a32cacc..15c5164d0ef41a978c16ee317fa73e97
 +    // Paper end - block counting
  }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ef05c75d86ce3a7e4d4438dcd6f98c778568634a..0d4e1a90dbdca72df5776b1294e87c85434e53ac 100644
+index 62ef618aff33c98f96d0271bb2ab42235c941052..eda8a591033885c5dcb95f5ff651b12529f479ba 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -167,7 +167,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;
diff --git a/patches/server/0984-Rewrite-dataconverter-system.patch b/patches/server/0983-Rewrite-dataconverter-system.patch
index c973389ac9..c973389ac9 100644
--- a/patches/server/0984-Rewrite-dataconverter-system.patch
+++ b/patches/server/0983-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0985-disable-forced-empty-world-ticks.patch b/patches/server/0984-disable-forced-empty-world-ticks.patch
index 4e5fea24f6..4e5fea24f6 100644
--- a/patches/server/0985-disable-forced-empty-world-ticks.patch
+++ b/patches/server/0984-disable-forced-empty-world-ticks.patch
diff --git a/patches/server/0986-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0985-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
index 3046e40be7..3046e40be7 100644
--- a/patches/server/0986-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
+++ b/patches/server/0985-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/0987-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0986-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
index 30dde1fadd..30dde1fadd 100644
--- a/patches/server/0987-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/patches/server/0986-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/0988-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0987-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
index 761c57c8f2..761c57c8f2 100644
--- a/patches/server/0988-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
+++ b/patches/server/0987-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
diff --git a/patches/server/0989-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0988-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
index f51a3d8642..f51a3d8642 100644
--- a/patches/server/0989-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
+++ b/patches/server/0988-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0990-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0989-Allow-Saving-of-Oversized-Chunks.patch
index 4eef25929e..4eef25929e 100644
--- a/patches/server/0990-Allow-Saving-of-Oversized-Chunks.patch
+++ b/patches/server/0989-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0991-Flat-bedrock-generator-settings.patch b/patches/server/0990-Flat-bedrock-generator-settings.patch
index da68e7d65b..da68e7d65b 100644
--- a/patches/server/0991-Flat-bedrock-generator-settings.patch
+++ b/patches/server/0990-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0992-Entity-Activation-Range-2.0.patch b/patches/server/0991-Entity-Activation-Range-2.0.patch
index 8ce6ec4ca8..6430108bbd 100644
--- a/patches/server/0992-Entity-Activation-Range-2.0.patch
+++ b/patches/server/0991-Entity-Activation-Range-2.0.patch
@@ -111,7 +111,7 @@ index dec865affbaaa71d09806143d13a854100b98f23..eadbf175c69b6bb2d0df723afac96a51
          } else {
              passenger.stopRiding();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0d4e1a90dbdca72df5776b1294e87c85434e53ac..6043e9fafb6dca4134e0615f04c7a5cdd6bf1c2e 100644
+index eda8a591033885c5dcb95f5ff651b12529f479ba..242d9213d22cb552e48beee03aa2db141e39d1c4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -418,6 +418,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/0993-Optional-per-player-mob-spawns.patch b/patches/server/0992-Optional-per-player-mob-spawns.patch
index fee5589666..fee5589666 100644
--- a/patches/server/0993-Optional-per-player-mob-spawns.patch
+++ b/patches/server/0992-Optional-per-player-mob-spawns.patch
diff --git a/patches/server/0994-Anti-Xray.patch b/patches/server/0993-Anti-Xray.patch
index c7253f3697..c7253f3697 100644
--- a/patches/server/0994-Anti-Xray.patch
+++ b/patches/server/0993-Anti-Xray.patch
diff --git a/patches/server/0995-Eigencraft-redstone-implementation.patch b/patches/server/0994-Eigencraft-redstone-implementation.patch
index b3e3db6504..b3e3db6504 100644
--- a/patches/server/0995-Eigencraft-redstone-implementation.patch
+++ b/patches/server/0994-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0996-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0995-Add-Alternate-Current-redstone-implementation.patch
index 8e8dac3c75..8e8dac3c75 100644
--- a/patches/server/0996-Add-Alternate-Current-redstone-implementation.patch
+++ b/patches/server/0995-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/0997-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0996-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
index 29e8f09721..29e8f09721 100644
--- a/patches/server/0997-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
+++ b/patches/server/0996-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/0998-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/0997-Use-Velocity-compression-and-cipher-natives.patch
index bfac334a58..bfac334a58 100644
--- a/patches/server/0998-Use-Velocity-compression-and-cipher-natives.patch
+++ b/patches/server/0997-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/0999-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0998-Optimize-Collision-to-not-load-chunks.patch
index be9c95fd3b..43e8bded47 100644
--- a/patches/server/0999-Optimize-Collision-to-not-load-chunks.patch
+++ b/patches/server/0998-Optimize-Collision-to-not-load-chunks.patch
@@ -26,7 +26,7 @@ index db0a5c6258fa2b9a5d960f82f6b1f3bc2b386bc9..3a90dd1289d393426151d4457edaf997
          if (dimensiontransition.missingRespawnBlock()) {
              entityplayer1.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.NO_RESPAWN_BLOCK_AVAILABLE, 0.0F));
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6043e9fafb6dca4134e0615f04c7a5cdd6bf1c2e..e541a77381b03bd4dc648fc50aef77c304157fc0 100644
+index 242d9213d22cb552e48beee03aa2db141e39d1c4..52f3d0d4ce28cc6566166ae9a5a1b236ff8c027d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -250,6 +250,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/1000-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0999-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
index 65f5e3531e..65f5e3531e 100644
--- a/patches/server/1000-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
+++ b/patches/server/0999-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/1001-Optimize-Hoppers.patch b/patches/server/1000-Optimize-Hoppers.patch
index 5737f04445..46ee4f4df0 100644
--- a/patches/server/1001-Optimize-Hoppers.patch
+++ b/patches/server/1000-Optimize-Hoppers.patch
@@ -50,10 +50,10 @@ index 0000000000000000000000000000000000000000..5c42823726e70ce6c9d0121d07431548
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4a4ce372dd105d07f58d7d93d856cb3969969806..fb3dcce4e1888f96fdd260740d9d955962d879fc 100644
+index 999e9c8f842423e6f1a3e80902e9d076e01f6694..c13b4f39c19dd6a62ae39688bde5a4739b391e59 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1721,6 +1721,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1719,6 +1719,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              ServerLevel worldserver = (ServerLevel) iterator.next();
              worldserver.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - BlockPhysicsEvent
              worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent
@@ -62,7 +62,7 @@ index 4a4ce372dd105d07f58d7d93d856cb3969969806..fb3dcce4e1888f96fdd260740d9d9559
              this.profiler.push(() -> {
                  String s = String.valueOf(worldserver);
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 66047f876aedbcc33b86b5cfe2ace588523eb810..5367ece16352523cd7d3f432a137bbed68f82638 100644
+index 96b24c1415af531feef7d8ab4724f7fed3ae8388..eec0ec43590be7e8ae5b530a7404c98b5e23cb53 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -809,10 +809,16 @@ public final class ItemStack implements DataComponentHolder {
diff --git a/patches/server/1002-Entity-load-save-limit-per-chunk.patch b/patches/server/1001-Entity-load-save-limit-per-chunk.patch
index 9a5959e34f..9a5959e34f 100644
--- a/patches/server/1002-Entity-load-save-limit-per-chunk.patch
+++ b/patches/server/1001-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/1003-Optimize-Voxel-Shape-Merging.patch b/patches/server/1002-Optimize-Voxel-Shape-Merging.patch
index 114ee7cb28..114ee7cb28 100644
--- a/patches/server/1003-Optimize-Voxel-Shape-Merging.patch
+++ b/patches/server/1002-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/1004-Optimize-Bit-Operations-by-inlining.patch b/patches/server/1003-Optimize-Bit-Operations-by-inlining.patch
index b7d93a56b9..b7d93a56b9 100644
--- a/patches/server/1004-Optimize-Bit-Operations-by-inlining.patch
+++ b/patches/server/1003-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/1005-Remove-streams-from-hot-code.patch b/patches/server/1004-Remove-streams-from-hot-code.patch
index 4c6d94f7bf..4c6d94f7bf 100644
--- a/patches/server/1005-Remove-streams-from-hot-code.patch
+++ b/patches/server/1004-Remove-streams-from-hot-code.patch
diff --git a/patches/server/1006-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1005-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
index 6fc4445bbf..6fc4445bbf 100644
--- a/patches/server/1006-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
+++ b/patches/server/1005-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/1007-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1006-Custom-table-implementation-for-blockstate-state-loo.patch
index 96d90abea3..96d90abea3 100644
--- a/patches/server/1007-Custom-table-implementation-for-blockstate-state-loo.patch
+++ b/patches/server/1006-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/1008-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1007-Fix-entity-type-tags-suggestions-in-selectors.patch
index 7892753fc2..7892753fc2 100644
--- a/patches/server/1008-Fix-entity-type-tags-suggestions-in-selectors.patch
+++ b/patches/server/1007-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/1009-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1008-Handle-Oversized-block-entities-in-chunks.patch
index d3283fd63f..d3283fd63f 100644
--- a/patches/server/1009-Handle-Oversized-block-entities-in-chunks.patch
+++ b/patches/server/1008-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/server/1010-API-for-checking-sent-chunks.patch b/patches/server/1009-API-for-checking-sent-chunks.patch
index 1ff508b727..1ff508b727 100644
--- a/patches/server/1010-API-for-checking-sent-chunks.patch
+++ b/patches/server/1009-API-for-checking-sent-chunks.patch
diff --git a/patches/server/1011-Check-distance-in-entity-interactions.patch b/patches/server/1010-Check-distance-in-entity-interactions.patch
index 95e8e99b56..95e8e99b56 100644
--- a/patches/server/1011-Check-distance-in-entity-interactions.patch
+++ b/patches/server/1010-Check-distance-in-entity-interactions.patch
diff --git a/patches/server/1012-Configurable-Sand-Duping.patch b/patches/server/1011-Configurable-Sand-Duping.patch
index cbc52697db..cbc52697db 100644
--- a/patches/server/1012-Configurable-Sand-Duping.patch
+++ b/patches/server/1011-Configurable-Sand-Duping.patch
diff --git a/patches/server/1013-Optimise-general-POI-access.patch b/patches/server/1012-Optimise-general-POI-access.patch
index b3636fe591..b3636fe591 100644
--- a/patches/server/1013-Optimise-general-POI-access.patch
+++ b/patches/server/1012-Optimise-general-POI-access.patch
diff --git a/patches/server/1014-Improve-performance-of-mass-crafts.patch b/patches/server/1013-Improve-performance-of-mass-crafts.patch
index 15701b21e0..15701b21e0 100644
--- a/patches/server/1014-Improve-performance-of-mass-crafts.patch
+++ b/patches/server/1013-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1015-Properly-resend-entities.patch b/patches/server/1014-Properly-resend-entities.patch
index 956f16576f..148750ed59 100644
--- a/patches/server/1015-Properly-resend-entities.patch
+++ b/patches/server/1014-Properly-resend-entities.patch
@@ -134,7 +134,7 @@ index 3a90dd1289d393426151d4457edaf99731cc34db..ec058eb6a10500831f173dcb47576c32
  
      }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e541a77381b03bd4dc648fc50aef77c304157fc0..34b67d7551c0ce354bc7bdb6a3581100c983ac47 100644
+index 52f3d0d4ce28cc6566166ae9a5a1b236ff8c027d..74231cb1c89079473d1727aa3ae2a539d4250317 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -684,13 +684,45 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/1016-Registry-Modification-API.patch b/patches/server/1015-Registry-Modification-API.patch
index 3b36d1ffd9..3b36d1ffd9 100644
--- a/patches/server/1016-Registry-Modification-API.patch
+++ b/patches/server/1015-Registry-Modification-API.patch
diff --git a/patches/server/1017-Add-registry-entry-and-builders.patch b/patches/server/1016-Add-registry-entry-and-builders.patch
index a37a06a160..a37a06a160 100644
--- a/patches/server/1017-Add-registry-entry-and-builders.patch
+++ b/patches/server/1016-Add-registry-entry-and-builders.patch
diff --git a/patches/server/1018-Improved-Watchdog-Support.patch b/patches/server/1017-Improved-Watchdog-Support.patch
index 5d035a4ad4..4c18803565 100644
--- a/patches/server/1018-Improved-Watchdog-Support.patch
+++ b/patches/server/1017-Improved-Watchdog-Support.patch
@@ -115,7 +115,7 @@ index 244a19ecd0234fa1d7a6ecfea20751595688605d..581bd217304e0f9e0b2113c335694805
          /* CraftBukkit start - Replace everything
          OptionParser optionparser = new OptionParser();
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fb3dcce4e1888f96fdd260740d9d955962d879fc..93ebdbfad4f9f300f31a124d8d4b36c4f5ce382c 100644
+index c13b4f39c19dd6a62ae39688bde5a4739b391e59..d25d500a2206d4f7e821de3766e8a523df4370e3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -307,7 +307,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -127,8 +127,8 @@ index fb3dcce4e1888f96fdd260740d9d955962d879fc..93ebdbfad4f9f300f31a124d8d4b36c4
      // CraftBukkit end
      // Spigot start
      public static final int TPS = 20;
-@@ -320,6 +320,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     public static long currentTickLong = 0L; // Paper - track current tick as a long
+@@ -319,6 +319,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations; // Paper - add paper configuration files
      public boolean isIteratingOverLevels = false; // Paper - Throw exception on world create while being ticked
  
 +    public volatile Thread shutdownThread; // Paper
@@ -137,7 +137,7 @@ index fb3dcce4e1888f96fdd260740d9d955962d879fc..93ebdbfad4f9f300f31a124d8d4b36c4
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
          Thread thread = new ca.spottedleaf.moonrise.common.util.TickThread(() -> { // Paper - rewrite chunk system
-@@ -489,6 +492,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -488,6 +491,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
          */
          // Paper end
@@ -145,7 +145,7 @@ index fb3dcce4e1888f96fdd260740d9d955962d879fc..93ebdbfad4f9f300f31a124d8d4b36c4
          Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
          // CraftBukkit end
          this.paperConfigurations = services.paperConfigurations(); // Paper - add paper configuration files
-@@ -1005,6 +1009,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1004,6 +1008,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      // CraftBukkit start
      private boolean hasStopped = false;
      private boolean hasLoggedStop = false; // Paper - Debugging
@@ -153,7 +153,7 @@ index fb3dcce4e1888f96fdd260740d9d955962d879fc..93ebdbfad4f9f300f31a124d8d4b36c4
      private final Object stopLock = new Object();
      public final boolean hasStopped() {
          synchronized (this.stopLock) {
-@@ -1020,6 +1025,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1019,6 +1024,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.hasStopped = true;
          }
          if (!hasLoggedStop && isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper - Debugging
@@ -164,7 +164,7 @@ index fb3dcce4e1888f96fdd260740d9d955962d879fc..93ebdbfad4f9f300f31a124d8d4b36c4
          // CraftBukkit end
          if (this.metricsRecorder.isRecording()) {
              this.cancelRecordingMetrics();
-@@ -1093,7 +1102,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1092,7 +1101,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
          // Spigot end
  
@@ -182,7 +182,7 @@ index fb3dcce4e1888f96fdd260740d9d955962d879fc..93ebdbfad4f9f300f31a124d8d4b36c4
      }
  
      public String getLocalIp() {
-@@ -1188,6 +1207,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1187,6 +1206,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      protected void runServer() {
          try {
@@ -190,7 +190,7 @@ index fb3dcce4e1888f96fdd260740d9d955962d879fc..93ebdbfad4f9f300f31a124d8d4b36c4
              if (!this.initServer()) {
                  throw new IllegalStateException("Failed to initialize server");
              }
-@@ -1197,6 +1217,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1196,6 +1216,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.status = this.buildServerStatus();
  
              // Spigot start
@@ -208,7 +208,7 @@ index fb3dcce4e1888f96fdd260740d9d955962d879fc..93ebdbfad4f9f300f31a124d8d4b36c4
              org.spigotmc.WatchdogThread.hasStarted = true; // Paper
              Arrays.fill( this.recentTps, 20 );
              // Paper start - further improve server tick loop
-@@ -1292,6 +1323,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1290,6 +1321,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  JvmProfiler.INSTANCE.onServerTick(this.smoothedTickTimeMillis);
              }
          } catch (Throwable throwable) {
@@ -221,7 +221,7 @@ index fb3dcce4e1888f96fdd260740d9d955962d879fc..93ebdbfad4f9f300f31a124d8d4b36c4
              MinecraftServer.LOGGER.error("Encountered an unexpected exception", throwable);
              CrashReport crashreport = MinecraftServer.constructOrExtractCrashReport(throwable);
  
-@@ -1316,15 +1353,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1314,15 +1351,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                      this.services.profileCache().clearExecutor();
                  }
  
@@ -241,7 +241,7 @@ index fb3dcce4e1888f96fdd260740d9d955962d879fc..93ebdbfad4f9f300f31a124d8d4b36c4
              }
  
          }
-@@ -1447,6 +1484,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1445,6 +1482,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @Override
      public TickTask wrapRunnable(Runnable runnable) {
@@ -254,7 +254,7 @@ index fb3dcce4e1888f96fdd260740d9d955962d879fc..93ebdbfad4f9f300f31a124d8d4b36c4
          return new TickTask(this.tickCount, runnable);
      }
  
-@@ -2266,7 +2309,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2264,7 +2307,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.worldData.setDataConfiguration(worlddataconfiguration);
              this.resources.managers.updateRegistryTags();
              this.potionBrewing = this.potionBrewing.reload(this.worldData.enabledFeatures()); // Paper - Custom Potion Mixes
@@ -304,7 +304,7 @@ index 7d2896918ff5fed37e5de5a22c37b0c7f32634a8..d43b98bdfcb00603737a309c0fb7793d
      }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index cbf7b11215da18a1585efbf1a8aafa34bdc525ab..1a6630360ff6549538ed186cefc28cd99ca472a9 100644
+index ec058eb6a10500831f173dcb47576c32c7516318..0cfaf31273bbec7640eb3a2b16a8d2c816b0ed61 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -604,7 +604,7 @@ public abstract class PlayerList {
diff --git a/patches/server/1019-Proxy-ItemStack-to-CraftItemStack.patch b/patches/server/1018-Proxy-ItemStack-to-CraftItemStack.patch
index 0e609e40fd..0e609e40fd 100644
--- a/patches/server/1019-Proxy-ItemStack-to-CraftItemStack.patch
+++ b/patches/server/1018-Proxy-ItemStack-to-CraftItemStack.patch
diff --git a/patches/server/1020-Make-a-PDC-view-accessible-directly-from-ItemStack.patch b/patches/server/1019-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
index 31fdc957f8..31fdc957f8 100644
--- a/patches/server/1020-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
+++ b/patches/server/1019-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
diff --git a/patches/server/1021-Prioritize-Minecraft-commands-in-function-parsing-an.patch b/patches/server/1020-Prioritize-Minecraft-commands-in-function-parsing-an.patch
index 6e36d9a7b3..6e36d9a7b3 100644
--- a/patches/server/1021-Prioritize-Minecraft-commands-in-function-parsing-an.patch
+++ b/patches/server/1020-Prioritize-Minecraft-commands-in-function-parsing-an.patch
diff --git a/patches/server/1022-optimize-dirt-and-snow-spreading.patch b/patches/server/1021-optimize-dirt-and-snow-spreading.patch
index 49de7fcab9..49de7fcab9 100644
--- a/patches/server/1022-optimize-dirt-and-snow-spreading.patch
+++ b/patches/server/1021-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/1023-Fix-NPE-for-Jukebox-setRecord.patch b/patches/server/1022-Fix-NPE-for-Jukebox-setRecord.patch
index e15a77ee75..e15a77ee75 100644
--- a/patches/server/1023-Fix-NPE-for-Jukebox-setRecord.patch
+++ b/patches/server/1022-Fix-NPE-for-Jukebox-setRecord.patch
diff --git a/patches/server/1024-Fix-CraftWorld-isChunkGenerated.patch b/patches/server/1023-Fix-CraftWorld-isChunkGenerated.patch
index c402325cb5..c402325cb5 100644
--- a/patches/server/1024-Fix-CraftWorld-isChunkGenerated.patch
+++ b/patches/server/1023-Fix-CraftWorld-isChunkGenerated.patch
diff --git a/patches/server/1025-fix-horse-inventories.patch b/patches/server/1024-fix-horse-inventories.patch
index 9737a4fa71..9737a4fa71 100644
--- a/patches/server/1025-fix-horse-inventories.patch
+++ b/patches/server/1024-fix-horse-inventories.patch
diff --git a/patches/server/1026-Only-call-EntityDamageEvents-before-actuallyHurt.patch b/patches/server/1025-Only-call-EntityDamageEvents-before-actuallyHurt.patch
index e1393a8173..e1393a8173 100644
--- a/patches/server/1026-Only-call-EntityDamageEvents-before-actuallyHurt.patch
+++ b/patches/server/1025-Only-call-EntityDamageEvents-before-actuallyHurt.patch
diff --git a/patches/server/1027-Fix-entity-tracker-desync-when-new-players-are-added.patch b/patches/server/1026-Fix-entity-tracker-desync-when-new-players-are-added.patch
index f767b9ab91..f767b9ab91 100644
--- a/patches/server/1027-Fix-entity-tracker-desync-when-new-players-are-added.patch
+++ b/patches/server/1026-Fix-entity-tracker-desync-when-new-players-are-added.patch
diff --git a/patches/server/1028-Lag-compensation-ticks.patch b/patches/server/1027-Lag-compensation-ticks.patch
index ba29615632..aa8b7f2d46 100644
--- a/patches/server/1028-Lag-compensation-ticks.patch
+++ b/patches/server/1027-Lag-compensation-ticks.patch
@@ -8,10 +8,10 @@ Areas affected by lag comepnsation:
  - Eating food items
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 93ebdbfad4f9f300f31a124d8d4b36c4f5ce382c..a2875f7cdfb6b43ed59cff41ab4122a08c4cc57f 100644
+index d25d500a2206d4f7e821de3766e8a523df4370e3..b64c3e29e2b8e890073fee0b45c8b8dfc2b642fd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -322,6 +322,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -321,6 +321,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      public volatile Thread shutdownThread; // Paper
      public volatile boolean abnormalExit = false; // Paper
@@ -19,7 +19,7 @@ index 93ebdbfad4f9f300f31a124d8d4b36c4f5ce382c..a2875f7cdfb6b43ed59cff41ab4122a0
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
-@@ -1765,6 +1766,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1763,6 +1764,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              worldserver.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - BlockPhysicsEvent
              worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent
              net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper - Perf: Optimize Hoppers
diff --git a/patches/server/1029-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1028-Detail-more-information-in-watchdog-dumps.patch
index 1806b418e3..cddaca3e53 100644
--- a/patches/server/1029-Detail-more-information-in-watchdog-dumps.patch
+++ b/patches/server/1028-Detail-more-information-in-watchdog-dumps.patch
@@ -122,7 +122,7 @@ index 9e1af229f52a8ac09833901ad53bd154fed34a4f..c5698b05cc3ea4cb1bc6789c30f2aab7
  
      private void tickPassenger(Entity vehicle, Entity passenger) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 34b67d7551c0ce354bc7bdb6a3581100c983ac47..e0827d8bb3fa17d4f590a5342ff41a514f623e68 100644
+index 74231cb1c89079473d1727aa3ae2a539d4250317..9f68c0fda7f5526eb97619f1a35ed3b78d1b3751 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1086,8 +1086,43 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/patches/server/1030-Write-SavedData-IO-async.patch b/patches/server/1029-Write-SavedData-IO-async.patch
index cceb676e45..cceb676e45 100644
--- a/patches/server/1030-Write-SavedData-IO-async.patch
+++ b/patches/server/1029-Write-SavedData-IO-async.patch
diff --git a/patches/server/1031-Add-ItemType-getItemRarity.patch b/patches/server/1030-Add-ItemType-getItemRarity.patch
index 35ebf5036b..35ebf5036b 100644
--- a/patches/server/1031-Add-ItemType-getItemRarity.patch
+++ b/patches/server/1030-Add-ItemType-getItemRarity.patch
diff --git a/patches/server/1032-Incremental-chunk-and-player-saving.patch b/patches/server/1031-Incremental-chunk-and-player-saving.patch
index 171e0f1feb..8c2a39d8fe 100644
--- a/patches/server/1032-Incremental-chunk-and-player-saving.patch
+++ b/patches/server/1031-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 a2875f7cdfb6b43ed59cff41ab4122a08c4cc57f..45695abbeb0a6d47b31b23ba6c464f17e99d7898 100644
+index b64c3e29e2b8e890073fee0b45c8b8dfc2b642fd..aa38e3b297209cc121e7dc7a6ac9588c18bf9357 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -993,7 +993,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -992,7 +992,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
          try {
              this.isSaving = true;
@@ -17,7 +17,7 @@ index a2875f7cdfb6b43ed59cff41ab4122a08c4cc57f..45695abbeb0a6d47b31b23ba6c464f17
              flag3 = this.saveAllChunks(suppressLogs, flush, force);
          } finally {
              this.isSaving = false;
-@@ -1597,16 +1597,28 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1595,16 +1595,28 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
  
          --this.ticksUntilAutosave;
diff --git a/patches/server/1033-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1032-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
index 114443675b..114443675b 100644
--- a/patches/server/1033-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
+++ b/patches/server/1032-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/1034-Bundle-spark.patch b/patches/server/1033-Bundle-spark.patch
index 755da7191b..0a5655b71e 100644
--- a/patches/server/1034-Bundle-spark.patch
+++ b/patches/server/1033-Bundle-spark.patch
@@ -269,10 +269,10 @@ index 6b8ed8a0baaf4a57d20e57cec3400af5561ddd79..48604e7f96adc9e226e034054c5e2bad
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 45695abbeb0a6d47b31b23ba6c464f17e99d7898..23ddd26af762c1cd7fb3920669abb96b3213ab37 100644
+index aa38e3b297209cc121e7dc7a6ac9588c18bf9357..696d075ca2883f3c37e35f983c4d020e5db89d16 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -752,6 +752,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -751,6 +751,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          // Paper end - Configurable player collision
  
          this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD);
@@ -281,7 +281,7 @@ index 45695abbeb0a6d47b31b23ba6c464f17e99d7898..23ddd26af762c1cd7fb3920669abb96b
          if (io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper != null) io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper.pluginsEnabled(); // Paper - Remap plugins
          io.papermc.paper.command.brigadier.PaperCommands.INSTANCE.setValid(); // Paper - reset invalid state for event fire below
          io.papermc.paper.plugin.lifecycle.event.LifecycleEventRunner.INSTANCE.callReloadableRegistrarEvent(io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents.COMMANDS, io.papermc.paper.command.brigadier.PaperCommands.INSTANCE, org.bukkit.plugin.Plugin.class, io.papermc.paper.plugin.lifecycle.event.registrar.ReloadableRegistrarEvent.Cause.INITIAL); // Paper - call commands event for regular plugins
-@@ -1038,6 +1040,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1037,6 +1039,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          MinecraftServer.LOGGER.info("Stopping server");
          Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
          MinecraftTimings.stopServer(); // Paper
@@ -289,7 +289,7 @@ index 45695abbeb0a6d47b31b23ba6c464f17e99d7898..23ddd26af762c1cd7fb3920669abb96b
          // CraftBukkit start
          if (this.server != null) {
              this.server.disablePlugins();
-@@ -1227,6 +1230,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1226,6 +1229,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              // tasks are default scheduled at -1 + delay, and first tick will tick at 1
              final long actualDoneTimeMs = System.currentTimeMillis() - org.bukkit.craftbukkit.Main.BOOT_TIME.toEpochMilli(); // Paper - Add total time
              LOGGER.info("Done ({})! For help, type \"help\"", String.format(java.util.Locale.ROOT, "%.3fs", actualDoneTimeMs / 1000.00D)); // Paper - Add total time
@@ -297,7 +297,7 @@ index 45695abbeb0a6d47b31b23ba6c464f17e99d7898..23ddd26af762c1cd7fb3920669abb96b
              org.spigotmc.WatchdogThread.tick();
              // Paper end - Improved Watchdog Support
              org.spigotmc.WatchdogThread.hasStarted = true; // Paper
-@@ -1586,6 +1590,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1584,6 +1588,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          });
          isOversleep = false;MinecraftTimings.serverOversleep.stopTiming();
          // Paper end
@@ -305,7 +305,7 @@ index 45695abbeb0a6d47b31b23ba6c464f17e99d7898..23ddd26af762c1cd7fb3920669abb96b
          new com.destroystokyo.paper.event.server.ServerTickStartEvent(this.tickCount+1).callEvent(); // Paper - Server Tick Events
  
          ++this.tickCount;
-@@ -1628,6 +1633,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1626,6 +1631,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          long endTime = System.nanoTime();
          long remaining = (TICK_TIME - (endTime - lastTick)) - catchupTime;
          new com.destroystokyo.paper.event.server.ServerTickEndEvent(this.tickCount, ((double)(endTime - lastTick) / 1000000D), remaining).callEvent();
diff --git a/patches/server/1035-Add-plugin-info-at-startup.patch b/patches/server/1034-Add-plugin-info-at-startup.patch
index 051309bbed..051309bbed 100644
--- a/patches/server/1035-Add-plugin-info-at-startup.patch
+++ b/patches/server/1034-Add-plugin-info-at-startup.patch
diff --git a/patches/server/1036-Make-interaction-leniency-distance-configurable.patch b/patches/server/1035-Make-interaction-leniency-distance-configurable.patch
index c0f7fc9fdc..c0f7fc9fdc 100644
--- a/patches/server/1036-Make-interaction-leniency-distance-configurable.patch
+++ b/patches/server/1035-Make-interaction-leniency-distance-configurable.patch
diff --git a/patches/server/1037-Fix-PickupStatus-getting-reset.patch b/patches/server/1036-Fix-PickupStatus-getting-reset.patch
index a952f8a688..a952f8a688 100644
--- a/patches/server/1037-Fix-PickupStatus-getting-reset.patch
+++ b/patches/server/1036-Fix-PickupStatus-getting-reset.patch
diff --git a/patches/server/1038-Check-for-block-type-in-SculkSensorBlock-canActivate.patch b/patches/server/1037-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
index c56c52b165..c56c52b165 100644
--- a/patches/server/1038-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
+++ b/patches/server/1037-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
diff --git a/patches/server/1039-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/server/1038-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
index 8347a4c5c4..8347a4c5c4 100644
--- a/patches/server/1039-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
+++ b/patches/server/1038-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
diff --git a/patches/server/1040-Configuration-for-horizontal-only-item-merging.patch b/patches/server/1039-Configuration-for-horizontal-only-item-merging.patch
index 1c45d3f2f0..76e790b082 100644
--- a/patches/server/1040-Configuration-for-horizontal-only-item-merging.patch
+++ b/patches/server/1039-Configuration-for-horizontal-only-item-merging.patch
@@ -14,10 +14,10 @@ This allows us to have both the reduced number of item entities a high item-merg
 without most of the visual artifacts caused by items merging vertically.
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index ea0d9335446b20073b9aafb9de453097355db79c..607f1a9802eb0ff4865af4c53f302128a6e6fe02 100644
+index cbfb07bdf8d5e2e5a462835184be2d47e59d506c..03cfa29bdb426a9fb6b1b6be6e897da48d4f2f3e 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-@@ -284,7 +284,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+@@ -282,7 +282,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
          if (this.isMergable()) {
              // Spigot start
              double radius = this.level().spigotConfig.itemMerge;
diff --git a/patches/server/1041-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1040-Optimise-collision-checking-in-player-move-packet-ha.patch
index 2caf83aaca..2caf83aaca 100644
--- a/patches/server/1041-Optimise-collision-checking-in-player-move-packet-ha.patch
+++ b/patches/server/1040-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/1042-Add-skipping-world-symlink-scan.patch b/patches/server/1041-Add-skipping-world-symlink-scan.patch
index edbbf7edf8..edbbf7edf8 100644
--- a/patches/server/1042-Add-skipping-world-symlink-scan.patch
+++ b/patches/server/1041-Add-skipping-world-symlink-scan.patch
diff --git a/patches/server/1043-Add-even-more-Enchantment-API.patch b/patches/server/1042-Add-even-more-Enchantment-API.patch
index dfc79b5b19..dfc79b5b19 100644
--- a/patches/server/1043-Add-even-more-Enchantment-API.patch
+++ b/patches/server/1042-Add-even-more-Enchantment-API.patch
diff --git a/patches/server/1044-Leashable-API.patch b/patches/server/1043-Leashable-API.patch
index ed84c78869..ed84c78869 100644
--- a/patches/server/1044-Leashable-API.patch
+++ b/patches/server/1043-Leashable-API.patch
diff --git a/patches/server/1045-Fix-CraftBukkit-drag-system.patch b/patches/server/1044-Fix-CraftBukkit-drag-system.patch
index fe2da46cc5..fe2da46cc5 100644
--- a/patches/server/1045-Fix-CraftBukkit-drag-system.patch
+++ b/patches/server/1044-Fix-CraftBukkit-drag-system.patch
diff --git a/patches/server/1046-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch b/patches/server/1045-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
index 052376aaeb..052376aaeb 100644
--- a/patches/server/1046-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
+++ b/patches/server/1045-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
diff --git a/patches/server/1047-Remove-set-damage-lootable-item-function-from-compas.patch b/patches/server/1046-Remove-set-damage-lootable-item-function-from-compas.patch
index ac0c0e3513..ac0c0e3513 100644
--- a/patches/server/1047-Remove-set-damage-lootable-item-function-from-compas.patch
+++ b/patches/server/1046-Remove-set-damage-lootable-item-function-from-compas.patch
diff --git a/patches/server/1048-Properly-destroy-placed-blocks-on-the-end-platform.patch b/patches/server/1047-Properly-destroy-placed-blocks-on-the-end-platform.patch
index 9bbeddc476..9bbeddc476 100644
--- a/patches/server/1048-Properly-destroy-placed-blocks-on-the-end-platform.patch
+++ b/patches/server/1047-Properly-destroy-placed-blocks-on-the-end-platform.patch
diff --git a/patches/server/1049-Add-enchantment-seed-update-API.patch b/patches/server/1048-Add-enchantment-seed-update-API.patch
index f66f062401..f66f062401 100644
--- a/patches/server/1049-Add-enchantment-seed-update-API.patch
+++ b/patches/server/1048-Add-enchantment-seed-update-API.patch
diff --git a/patches/server/1050-Fix-synchronise-sending-chat-to-client-with-updating.patch b/patches/server/1049-Fix-synchronise-sending-chat-to-client-with-updating.patch
index e4eb40db0f..e4eb40db0f 100644
--- a/patches/server/1050-Fix-synchronise-sending-chat-to-client-with-updating.patch
+++ b/patches/server/1049-Fix-synchronise-sending-chat-to-client-with-updating.patch
diff --git a/patches/server/1051-Fix-InventoryOpenEvent-cancellation.patch b/patches/server/1050-Fix-InventoryOpenEvent-cancellation.patch
index e63dbfd2aa..e63dbfd2aa 100644
--- a/patches/server/1051-Fix-InventoryOpenEvent-cancellation.patch
+++ b/patches/server/1050-Fix-InventoryOpenEvent-cancellation.patch
diff --git a/patches/server/1052-Fire-BlockExpEvent-on-grindstone-use.patch b/patches/server/1051-Fire-BlockExpEvent-on-grindstone-use.patch
index 58783e8acd..58783e8acd 100644
--- a/patches/server/1052-Fire-BlockExpEvent-on-grindstone-use.patch
+++ b/patches/server/1051-Fire-BlockExpEvent-on-grindstone-use.patch
diff --git a/patches/server/1053-Check-dead-flag-in-isAlive.patch b/patches/server/1052-Check-dead-flag-in-isAlive.patch
index e00e21c5b9..e00e21c5b9 100644
--- a/patches/server/1053-Check-dead-flag-in-isAlive.patch
+++ b/patches/server/1052-Check-dead-flag-in-isAlive.patch
diff --git a/patches/server/1054-Add-FeatureFlag-API.patch b/patches/server/1053-Add-FeatureFlag-API.patch
index 5f3aa9ba14..5f3aa9ba14 100644
--- a/patches/server/1054-Add-FeatureFlag-API.patch
+++ b/patches/server/1053-Add-FeatureFlag-API.patch
diff --git a/patches/server/1055-Tag-Lifecycle-Events.patch b/patches/server/1054-Tag-Lifecycle-Events.patch
index 547a10d9e3..547a10d9e3 100644
--- a/patches/server/1055-Tag-Lifecycle-Events.patch
+++ b/patches/server/1054-Tag-Lifecycle-Events.patch
diff --git a/patches/server/1056-Item-serialization-as-json.patch b/patches/server/1055-Item-serialization-as-json.patch
index 988bbbea45..988bbbea45 100644
--- a/patches/server/1056-Item-serialization-as-json.patch
+++ b/patches/server/1055-Item-serialization-as-json.patch
diff --git a/patches/server/1057-Validate-slot-in-PlayerInventory-setSlot.patch b/patches/server/1056-Validate-slot-in-PlayerInventory-setSlot.patch
index 51eb36e240..51eb36e240 100644
--- a/patches/server/1057-Validate-slot-in-PlayerInventory-setSlot.patch
+++ b/patches/server/1056-Validate-slot-in-PlayerInventory-setSlot.patch
diff --git a/patches/server/1057-Remove-wall-time-unused-skip-tick-protection.patch b/patches/server/1057-Remove-wall-time-unused-skip-tick-protection.patch
new file mode 100644
index 0000000000..e2d5d9dcab
--- /dev/null
+++ b/patches/server/1057-Remove-wall-time-unused-skip-tick-protection.patch
@@ -0,0 +1,163 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Bjarne Koll <[email protected]>
+Date: Mon, 16 Sep 2024 23:07:29 +0200
+Subject: [PATCH] Remove wall-time / unused skip tick protection
+
+Spigot still maintains some partial implementation of "tick skipping", a
+practice in which the MinecraftServer.currentTick field is updated not
+by an increment of one per actual tick, but instead set to
+System.currentTimeMillis() / 50. This behaviour means that the tracked
+tick may "skip" a tick value in case a previous tick took more than the
+expected 50ms.
+
+To compensate for this in important paths, spigot/craftbukkit
+implements "wall-time". Instead of incrementing/decrementing ticks on
+block entities/entities by one for each call to their tick() method,
+they instead increment/decrement important values, like
+an ItemEntity's age or pickupDelay, by the difference of
+`currentTick - lastTick`, where `lastTick` is the value of
+`currentTick` during the last tick() call.
+
+These "fixes" however do not play nicely with minecraft's simulation
+distance as entities/block entities implementing the above behaviour
+would "catch up" their values when moving from a non-ticking chunk to a
+ticking one as their `lastTick` value remains stuck on the last tick in
+a ticking chunk and hence lead to a large "catch up" once ticked again.
+
+Paper completely removes the "tick skipping" behaviour (See patch
+"Further-improve-server-tick-loop"), making the above precautions
+completely unnecessary, which also rids paper of the previous described
+incompatibility with non-ticking chunks.
+
+diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+index 03cfa29bdb426a9fb6b1b6be6e897da48d4f2f3e..4423973d4d9a2c3879d98d1d4c8b8c117c677ac5 100644
+--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
++++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+@@ -60,7 +60,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+     @Nullable
+     public UUID target;
+     public final float bobOffs;
+-    private int lastTick = MinecraftServer.currentTick - 1; // CraftBukkit
++    // private int lastTick = MinecraftServer.currentTick - 1; // CraftBukkit // Paper - remove anti tick skipping measures / wall time
+     public boolean canMobPickup = true; // Paper - Item#canEntityPickup
+     private int despawnRate = -1; // Paper - Alternative item-despawn-rate
+     public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper - Friction API
+@@ -153,12 +153,11 @@ public class ItemEntity extends Entity implements TraceableEntity {
+             this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
+         } else {
+             super.tick();
+-            // CraftBukkit start - Use wall time for pickup and despawn timers
+-            int elapsedTicks = MinecraftServer.currentTick - this.lastTick;
+-            if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks;
+-            if (this.age != -32768) this.age += elapsedTicks;
+-            this.lastTick = MinecraftServer.currentTick;
+-            // CraftBukkit end
++            // Paper start - remove anti tick skipping measures / wall time - revert to vanilla
++            if (this.pickupDelay > 0 && this.pickupDelay != 32767) {
++                --this.pickupDelay;
++            }
++            // Paper end - remove anti tick skipping measures / wall time - revert to vanilla
+ 
+             this.xo = this.getX();
+             this.yo = this.getY();
+@@ -211,7 +210,7 @@ public class ItemEntity extends Entity implements TraceableEntity {
+                 this.mergeWithNeighbours();
+             }
+ 
+-            /* CraftBukkit start - moved up
++            // Paper - remove anti tick skipping measures / wall time - revert to vanilla /* CraftBukkit start - moved up
+             if (this.age != -32768) {
+                 ++this.age;
+             }
+@@ -242,12 +241,14 @@ public class ItemEntity extends Entity implements TraceableEntity {
+     // Spigot start - copied from above
+     @Override
+     public void inactiveTick() {
+-        // CraftBukkit start - Use wall time for pickup and despawn timers
+-        int elapsedTicks = MinecraftServer.currentTick - this.lastTick;
+-        if (this.pickupDelay != 32767) this.pickupDelay -= elapsedTicks;
+-        if (this.age != -32768) this.age += elapsedTicks;
+-        this.lastTick = MinecraftServer.currentTick;
+-        // CraftBukkit end
++        // Paper start - remove anti tick skipping measures / wall time - copied from above
++        if (this.pickupDelay > 0 && this.pickupDelay != 32767) {
++            --this.pickupDelay;
++        }
++        if (this.age != -32768) {
++            ++this.age;
++        }
++        // Paper end - remove anti tick skipping measures / wall time - copied from above
+ 
+         if (!this.level().isClientSide && this.age >= this.despawnRate) { // Spigot // Paper - Alternative item-despawn-rate
+             // CraftBukkit start - fire ItemDespawnEvent
+diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+index 2280004638fd19ed018cb3e77d53a018b34ec516..2b43337ac63d051718a2074fcc46e128a1d65129 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
++++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+@@ -96,7 +96,7 @@ public class Zombie extends Monster {
+     private boolean canBreakDoors;
+     private int inWaterTime;
+     public int conversionTime;
+-    private int lastTick = MinecraftServer.currentTick; // CraftBukkit - add field
++    // private int lastTick = MinecraftServer.currentTick; // CraftBukkit - add field // Paper - remove anti tick skipping measures / wall time
+     private boolean shouldBurnInDay = true; // Paper - Add more Zombie API
+ 
+     public Zombie(EntityType<? extends Zombie> type, Level world) {
+@@ -219,10 +219,7 @@ public class Zombie extends Monster {
+     public void tick() {
+         if (!this.level().isClientSide && this.isAlive() && !this.isNoAi()) {
+             if (this.isUnderWaterConverting()) {
+-                // CraftBukkit start - Use wall time instead of ticks for conversion
+-                int elapsedTicks = MinecraftServer.currentTick - this.lastTick;
+-                this.conversionTime -= elapsedTicks;
+-                // CraftBukkit end
++                --this.conversionTime; // Paper - remove anti tick skipping measures / wall time
+                 if (this.conversionTime < 0) {
+                     this.doUnderWaterConversion();
+                 }
+@@ -239,7 +236,7 @@ public class Zombie extends Monster {
+         }
+ 
+         super.tick();
+-        this.lastTick = MinecraftServer.currentTick; // CraftBukkit
++        // this.lastTick = MinecraftServer.currentTick; // CraftBukkit // Paper - remove anti tick skipping measures / wall time
+     }
+ 
+     @Override
+@@ -280,7 +277,7 @@ public class Zombie extends Monster {
+     }
+     // Paper end - Add more Zombie API
+     public void startUnderWaterConversion(int ticksUntilWaterConversion) {
+-        this.lastTick = MinecraftServer.currentTick; // CraftBukkit
++        // this.lastTick = MinecraftServer.currentTick; // CraftBukkit // Paper - remove anti tick skipping measures / wall time
+         this.conversionTime = ticksUntilWaterConversion;
+         this.getEntityData().set(Zombie.DATA_DROWNED_CONVERSION_ID, true);
+     }
+diff --git a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
+index a2fafef89d5354e2cb02f5672810909950a57777..bf2c303a314205590a2839e0f729af3a9ff40a86 100644
+--- a/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
++++ b/src/main/java/net/minecraft/world/level/block/entity/BrewingStandBlockEntity.java
+@@ -54,7 +54,7 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
+     public int fuel;
+     protected final ContainerData dataAccess;
+     // CraftBukkit start - add fields and methods
+-    private int lastTick = MinecraftServer.currentTick;
++    // private int lastTick = MinecraftServer.currentTick; // Paper - remove anti tick skipping measures / wall time
+     public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
+     private int maxStack = MAX_STACK;
+ 
+@@ -169,12 +169,10 @@ public class BrewingStandBlockEntity extends BaseContainerBlockEntity implements
+         boolean flag1 = blockEntity.brewTime > 0;
+         ItemStack itemstack1 = (ItemStack) blockEntity.items.get(3);
+ 
+-        // CraftBukkit start - Use wall time instead of ticks for brewing
+-        int elapsedTicks = MinecraftServer.currentTick - blockEntity.lastTick;
+-        blockEntity.lastTick = MinecraftServer.currentTick;
++        // Paper - remove anti tick skipping measures / wall time
+ 
+         if (flag1) {
+-            blockEntity.brewTime -= elapsedTicks;
++            --blockEntity.brewTime; // Paper - remove anti tick skipping measures / wall time - revert to vanilla
+             boolean flag2 = blockEntity.brewTime <= 0; // == -> <=
+             // CraftBukkit end
+