diff --git a/Paper b/Paper
index a0093e142..6ae212125 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit a0093e142be3bc231a0b080b9fc44fe75a97ac40
+Subproject commit 6ae2121257b554cd349a32bebb928780f02ab57d
diff --git a/patches/api/0007-AFK-API.patch b/patches/api/0007-AFK-API.patch
index 40eb942c7..8aafb2734 100644
--- a/patches/api/0007-AFK-API.patch
+++ b/patches/api/0007-AFK-API.patch
@@ -81,7 +81,7 @@ index 0000000000000000000000000000000000000000..0c8b3e5e4ba412624357ea5662a78862
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a782286c381907dad341ab4985eb774291f5520f..1679c292d17959740852fc2188c2f21a02bd831e 100644
+index 7cf7e7c32c7504583c991d3ea89ef3bad7093588..932f853a00b6005cc07ad4c445f02a3478eef484 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2105,4 +2105,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0016-Player-invulnerabilities.patch b/patches/api/0016-Player-invulnerabilities.patch
index 005ff537b..9f829e6d6 100644
--- a/patches/api/0016-Player-invulnerabilities.patch
+++ b/patches/api/0016-Player-invulnerabilities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 1679c292d17959740852fc2188c2f21a02bd831e..91b48898005976e9cf2e8b0bec8e03bc70d16f00 100644
+index 932f853a00b6005cc07ad4c445f02a3478eef484..4cf1317ea5a74d4a29120009bbd68078fe165fb4 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2125,5 +2125,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0032-Fix-javadoc-warnings-missing-param-and-return.patch b/patches/api/0032-Fix-javadoc-warnings-missing-param-and-return.patch
index ca60921ec..8db078beb 100644
--- a/patches/api/0032-Fix-javadoc-warnings-missing-param-and-return.patch
+++ b/patches/api/0032-Fix-javadoc-warnings-missing-param-and-return.patch
@@ -735,7 +735,7 @@ index 2e17b2d4f759531fbe9ee8e9b00c839186af09ca..9382234722792b5920a2456187e07958
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
-index 8ca6c9eba926f436203af211c6e274a59ddb15e8..f61419d3ce15bd553a864e4e9cd988b57d8f9695 100644
+index 2f0c6af7fa6688a98d6aa0bd3f0e6556af8330d0..b38c69482e3112e0cd626bcb17f4523c541b748f 100644
 --- a/src/main/java/org/bukkit/entity/ArmorStand.java
 +++ b/src/main/java/org/bukkit/entity/ArmorStand.java
 @@ -7,6 +7,9 @@ import org.bukkit.util.EulerAngle;
@@ -932,7 +932,7 @@ index a6a7429ed2e1eefb2b12b7480ed74fcc3963a864..e8027e1d505dda6effbb1698550016e8
  
          NORMAL(false),
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 91b48898005976e9cf2e8b0bec8e03bc70d16f00..3f6fb8e862f8c7591262d4a6e1e3a95ee18b8f72 100644
+index 4cf1317ea5a74d4a29120009bbd68078fe165fb4..dec8f865c346463bc0b50359aa0dc062fe2585da 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1935,6 +1935,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch
index 9f6dc041f..cc36314fc 100644
--- a/patches/server/0001-Tuinity-Server-Changes.patch
+++ b/patches/server/0001-Tuinity-Server-Changes.patch
@@ -11992,10 +11992,10 @@ index ff74be14512a947e81b62d53e616131ca7d7f609..e79e773f2219f9a9ae076fcbc8108b79
      public static <T> void mergeSortedSets(final java.util.function.Consumer<T> consumer, final java.util.Comparator<? super T> comparator, final java.util.SortedSet<T>...sets) {
          final ObjectRBTreeSet<T> all = new ObjectRBTreeSet<>(comparator);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ccf2d0b090f0c360dfc7886bb0726e099acec42c..1768554b00ea0b7a57ebbed1f0bc5d8fd6f02f76 100644
+index ccac3589820f244f36dac310d08091f218d5935e..3c5096ea5eb9e9b75b549b9f47b7ffeaac8fc457 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -152,6 +152,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -153,6 +153,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      public org.bukkit.command.RemoteConsoleCommandSender remoteConsole;
      //public ConsoleReader reader; // Paper
      public static int currentTick = 0; // Paper - Further improve tick loop
@@ -12003,7 +12003,7 @@ index ccf2d0b090f0c360dfc7886bb0726e099acec42c..1768554b00ea0b7a57ebbed1f0bc5d8f
      public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
      public int autosavePeriod;
      public boolean serverAutoSave = false; // Paper
-@@ -750,10 +751,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -753,10 +754,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          org.spigotmc.WatchdogThread.doStop(); // Paper
          if (!isMainThread()) {
              MinecraftServer.LOGGER.info("Stopping main thread (Ignore any thread death message you see! - DO NOT REPORT THREAD DEATH TO PAPER)");
@@ -12016,7 +12016,7 @@ index ccf2d0b090f0c360dfc7886bb0726e099acec42c..1768554b00ea0b7a57ebbed1f0bc5d8f
                  } catch (InterruptedException e) {}
              }
              // We've just obliterated the main thread, this will prevent stop from dying when removing players
-@@ -952,6 +954,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -957,6 +959,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                  // Paper end
  
                  PaperJvmChecker.checkJvm(); // Paper jvm version nag
@@ -12024,7 +12024,7 @@ index ccf2d0b090f0c360dfc7886bb0726e099acec42c..1768554b00ea0b7a57ebbed1f0bc5d8f
                  org.spigotmc.WatchdogThread.tick(); // Paper
                  org.spigotmc.WatchdogThread.hasStarted = true; // Paper
                  Arrays.fill( recentTps, 20 );
-@@ -969,6 +972,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -974,6 +977,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                          this.lastOverloadTime = this.nextTick;
                      }
  
@@ -12032,7 +12032,7 @@ index ccf2d0b090f0c360dfc7886bb0726e099acec42c..1768554b00ea0b7a57ebbed1f0bc5d8f
                      if ( ++MinecraftServer.currentTick % SAMPLE_INTERVAL == 0 )
                      {
                          final long diff = curTime - tickSection;
-@@ -983,7 +987,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -988,7 +992,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                          // Paper end
                          tickSection = curTime;
                      }
@@ -12041,7 +12041,7 @@ index ccf2d0b090f0c360dfc7886bb0726e099acec42c..1768554b00ea0b7a57ebbed1f0bc5d8f
                      // Spigot end
  
                      //MinecraftServer.currentTick = (int) (System.currentTimeMillis() / 50); // CraftBukkit // Paper - don't overwrite current tick time
-@@ -1076,6 +1080,76 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1081,6 +1085,76 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
      // Paper end
  
@@ -12118,7 +12118,7 @@ index ccf2d0b090f0c360dfc7886bb0726e099acec42c..1768554b00ea0b7a57ebbed1f0bc5d8f
      private void executeModerately() {
          this.executeAll();
          java.util.concurrent.locks.LockSupport.parkNanos("executing tasks", 1000L);
-@@ -1089,22 +1163,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1094,22 +1168,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          });
      }
  
@@ -12142,7 +12142,7 @@ index ccf2d0b090f0c360dfc7886bb0726e099acec42c..1768554b00ea0b7a57ebbed1f0bc5d8f
  
      @Override
      protected TickTask postToMainThread(Runnable runnable) {
-@@ -1131,6 +1190,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1136,6 +1195,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
      private boolean bb() {
          if (super.executeNext()) {
@@ -12150,7 +12150,7 @@ index ccf2d0b090f0c360dfc7886bb0726e099acec42c..1768554b00ea0b7a57ebbed1f0bc5d8f
              return true;
          } else {
              if (this.canSleepForTick()) {
-@@ -1198,7 +1258,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1203,7 +1263,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          // Paper start - move oversleep into full server tick
          isOversleep = true;MinecraftTimings.serverOversleep.startTiming();
          this.awaitTasks(() -> {
@@ -12159,7 +12159,7 @@ index ccf2d0b090f0c360dfc7886bb0726e099acec42c..1768554b00ea0b7a57ebbed1f0bc5d8f
              return !this.canOversleep();
          });
          isOversleep = false;MinecraftTimings.serverOversleep.stopTiming();
-@@ -1263,6 +1323,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1268,6 +1328,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          }
          // Paper end
  
@@ -12168,7 +12168,7 @@ index ccf2d0b090f0c360dfc7886bb0726e099acec42c..1768554b00ea0b7a57ebbed1f0bc5d8f
          // Paper start
          long endTime = System.nanoTime();
          long remaining = (TICK_TIME - (endTime - lastTick)) - catchupTime;
-@@ -1289,16 +1351,16 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1294,16 +1356,16 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      protected void b(BooleanSupplier booleansupplier) {
@@ -12188,7 +12188,7 @@ index ccf2d0b090f0c360dfc7886bb0726e099acec42c..1768554b00ea0b7a57ebbed1f0bc5d8f
          this.methodProfiler.exitEnter("levels");
          Iterator iterator = this.getWorlds().iterator();
  
-@@ -1309,7 +1371,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1314,7 +1376,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              processQueue.remove().run();
          }
          MinecraftTimings.processQueueTimer.stopTiming(); // Spigot
@@ -12197,7 +12197,7 @@ index ccf2d0b090f0c360dfc7886bb0726e099acec42c..1768554b00ea0b7a57ebbed1f0bc5d8f
          MinecraftTimings.timeUpdateTimer.startTiming(); // Spigot // Paper
          // Send time updates to everyone, it will get the right time from the world the player is in.
          // Paper start - optimize time updates
-@@ -1352,11 +1414,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1357,11 +1419,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              this.methodProfiler.enter("tick");
  
              try {
@@ -12212,7 +12212,7 @@ index ccf2d0b090f0c360dfc7886bb0726e099acec42c..1768554b00ea0b7a57ebbed1f0bc5d8f
              } catch (Throwable throwable) {
                  // Spigot Start
                  CrashReport crashreport;
-@@ -1450,7 +1513,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1455,7 +1518,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
@@ -17618,10 +17618,10 @@ index 7511e38130f38703164395a670f12d1af648ff04..e602efcb3fad390bb6bff1055e782bba
                  }
                  value.append("},");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cd02c294ebbf95bf939a2d19feff0e29bb87edb1..7be915b36121c561cb85f36ab15bed78ffa748ec 100644
+index 968349163b15cf40dac9717072740ce48231b7c8..9e339b1c76e28987936f79ccc65a09c21c6aac5e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -231,7 +231,7 @@ import javax.annotation.Nullable; // Paper
+@@ -232,7 +232,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
@@ -17630,7 +17630,7 @@ index cd02c294ebbf95bf939a2d19feff0e29bb87edb1..7be915b36121c561cb85f36ab15bed78
      private final String serverVersion;
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
-@@ -863,6 +863,7 @@ public final class CraftServer implements Server {
+@@ -864,6 +864,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
@@ -17638,7 +17638,7 @@ index cd02c294ebbf95bf939a2d19feff0e29bb87edb1..7be915b36121c561cb85f36ab15bed78
          for (WorldServer world : console.getWorlds()) {
              world.worldDataServer.setDifficulty(config.difficulty);
              world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
-@@ -897,6 +898,7 @@ public final class CraftServer implements Server {
+@@ -898,6 +899,7 @@ public final class CraftServer implements Server {
              }
              world.spigotConfig.init(); // Spigot
              world.paperConfig.init(); // Paper
@@ -17646,7 +17646,7 @@ index cd02c294ebbf95bf939a2d19feff0e29bb87edb1..7be915b36121c561cb85f36ab15bed78
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -1899,7 +1901,10 @@ public final class CraftServer implements Server {
+@@ -1901,7 +1903,10 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean isPrimaryThread() {
@@ -17658,7 +17658,7 @@ index cd02c294ebbf95bf939a2d19feff0e29bb87edb1..7be915b36121c561cb85f36ab15bed78
      }
  
      // Paper start
-@@ -2333,6 +2338,14 @@ public final class CraftServer implements Server {
+@@ -2335,6 +2340,14 @@ public final class CraftServer implements Server {
              return com.destroystokyo.paper.PaperConfig.config;
          }
  
diff --git a/patches/server/0002-Rebrand.patch b/patches/server/0002-Rebrand.patch
index 84ed2056e..7dccfe216 100644
--- a/patches/server/0002-Rebrand.patch
+++ b/patches/server/0002-Rebrand.patch
@@ -48,10 +48,10 @@ index 229c3b0f0c650b501f31147adaa17194af57fedd..f88cf526d272fe47b5a474c0b344b748
                      throwable = throwable1;
                      throw throwable1;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1768554b00ea0b7a57ebbed1f0bc5d8fd6f02f76..fe4ef4ea7117a6f38e4d068aae5b5ec6de06507b 100644
+index 3c5096ea5eb9e9b75b549b9f47b7ffeaac8fc457..af9e0cad5fad27acfc1d0cd0e8ee1e11acef9b1a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1513,7 +1513,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1518,7 +1518,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
@@ -182,10 +182,10 @@ index 0000000000000000000000000000000000000000..d8b408f061d96e2fa8e2e587462e2221
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7be915b36121c561cb85f36ab15bed78ffa748ec..1931c16dfef12717e8c2b4db8f142ed42f90f1f1 100644
+index 9e339b1c76e28987936f79ccc65a09c21c6aac5e..4f7cfef40225bea13efa37468f51643a99ac594d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -231,7 +231,7 @@ import javax.annotation.Nullable; // Paper
+@@ -232,7 +232,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
diff --git a/patches/server/0003-Purpur-config-files.patch b/patches/server/0003-Purpur-config-files.patch
index 6cbb6ef75..be5749e71 100644
--- a/patches/server/0003-Purpur-config-files.patch
+++ b/patches/server/0003-Purpur-config-files.patch
@@ -373,10 +373,10 @@ index 0000000000000000000000000000000000000000..4904be939c7a4b1d1583fd7b6232c930
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1931c16dfef12717e8c2b4db8f142ed42f90f1f1..6210337825a5aa25036d252ca4663a061f25e980 100644
+index 4f7cfef40225bea13efa37468f51643a99ac594d..6c2e441405e05749b7579d48497281f5c3bee7f8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -864,6 +864,7 @@ public final class CraftServer implements Server {
+@@ -865,6 +865,7 @@ public final class CraftServer implements Server {
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
          com.tuinity.tuinity.config.TuinityConfig.init((File) console.options.valueOf("tuinity-settings")); // Tuinity - Server Config
@@ -384,7 +384,7 @@ index 1931c16dfef12717e8c2b4db8f142ed42f90f1f1..6210337825a5aa25036d252ca4663a06
          for (WorldServer world : console.getWorlds()) {
              world.worldDataServer.setDifficulty(config.difficulty);
              world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
-@@ -899,6 +900,7 @@ public final class CraftServer implements Server {
+@@ -900,6 +901,7 @@ public final class CraftServer implements Server {
              world.spigotConfig.init(); // Spigot
              world.paperConfig.init(); // Paper
              world.tuinityConfig.init(); // Tuinity - Server Config
@@ -392,7 +392,7 @@ index 1931c16dfef12717e8c2b4db8f142ed42f90f1f1..6210337825a5aa25036d252ca4663a06
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -917,6 +919,7 @@ public final class CraftServer implements Server {
+@@ -918,6 +920,7 @@ public final class CraftServer implements Server {
          reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
@@ -400,7 +400,7 @@ index 1931c16dfef12717e8c2b4db8f142ed42f90f1f1..6210337825a5aa25036d252ca4663a06
          overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
          ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2346,6 +2349,18 @@ public final class CraftServer implements Server {
+@@ -2348,6 +2351,18 @@ public final class CraftServer implements Server {
          }
          // Tuinity end - add config to timings report
  
diff --git a/patches/server/0008-AFK-API.patch b/patches/server/0008-AFK-API.patch
index c0bb2ad0b..4048a9ee3 100644
--- a/patches/server/0008-AFK-API.patch
+++ b/patches/server/0008-AFK-API.patch
@@ -263,7 +263,7 @@ index 361f7857e461578e90cb71e15027dadaf794cb69..2578a4677d1ee060f687be531e696b7c
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 18a50614a876c0a8ff996e48527a2e89c1078d50..0d990988005a7e7cc3f45715bfd17f109357fe7b 100644
+index 825e8c2be11105672c2f270ff024bd7a54f6c178..53d2c3e48dfbde9e409cf9e369ff9fa99908e1f2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2427,4 +2427,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0009-Bring-back-server-name.patch b/patches/server/0009-Bring-back-server-name.patch
index 76418cfe5..39002f7eb 100644
--- a/patches/server/0009-Bring-back-server-name.patch
+++ b/patches/server/0009-Bring-back-server-name.patch
@@ -17,10 +17,10 @@ index 65961a03728852bd75367083a0de6fd0082b17cb..780474397acb4d0e7ecb4540e1a2db57
      public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
      public final boolean pvp = this.getBoolean("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6210337825a5aa25036d252ca4663a061f25e980..01ed6d158094bc0d86832af539e1a5e3c0578771 100644
+index 6c2e441405e05749b7579d48497281f5c3bee7f8..78bd89a3b743a6f24cce189c863f332aa61a231c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2509,4 +2509,11 @@ public final class CraftServer implements Server {
+@@ -2511,4 +2511,11 @@ public final class CraftServer implements Server {
          return mobGoals;
      }
      // Paper end
diff --git a/patches/server/0010-Configurable-server-mod-name.patch b/patches/server/0010-Configurable-server-mod-name.patch
index 63d52dfd8..58843c442 100644
--- a/patches/server/0010-Configurable-server-mod-name.patch
+++ b/patches/server/0010-Configurable-server-mod-name.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable server mod name
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index fe4ef4ea7117a6f38e4d068aae5b5ec6de06507b..2f5ef91a5732800d9b9a7acbb52ad29b5c0729a3 100644
+index af9e0cad5fad27acfc1d0cd0e8ee1e11acef9b1a..1b2d0d2d619716617669b6de8c021b38fdb6a4c8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1513,7 +1513,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1518,7 +1518,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
diff --git a/patches/server/0012-Lagging-threshold.patch b/patches/server/0012-Lagging-threshold.patch
index ccd425bb3..0ddb54c0f 100644
--- a/patches/server/0012-Lagging-threshold.patch
+++ b/patches/server/0012-Lagging-threshold.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2f5ef91a5732800d9b9a7acbb52ad29b5c0729a3..64cd02072536e69cd219932769bbade87b47601a 100644
+index 1b2d0d2d619716617669b6de8c021b38fdb6a4c8..659cfb528b8641f5a46a465898a716a7f0b2adf7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -164,6 +164,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -165,6 +165,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      public static final int TICK_TIME = 1000000000 / TPS;
      private static final int SAMPLE_INTERVAL = 20; // Paper
      public final double[] recentTps = new double[ 3 ];
@@ -16,7 +16,7 @@ index 2f5ef91a5732800d9b9a7acbb52ad29b5c0729a3..64cd02072536e69cd219932769bbade8
      public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
      // Spigot end
  
-@@ -985,6 +986,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -990,6 +991,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                          recentTps[1] = tps5.getAverage();
                          recentTps[2] = tps15.getAverage();
                          // Paper end
@@ -41,10 +41,10 @@ index 4627261562a1482aecf4034b8717ecccc2dd9eb0..a34ed978596f1a466b0b48e7db92ac4f
      public static boolean enderChestSixRows = false;
      public static boolean enderChestPermissionRows = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 01ed6d158094bc0d86832af539e1a5e3c0578771..60af2c2770b5899edfe63d06829edceb5d7d3a71 100644
+index 78bd89a3b743a6f24cce189c863f332aa61a231c..4ad906b3ab91cee656c319d6c2deee59781ffe13 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2515,5 +2515,10 @@ public final class CraftServer implements Server {
+@@ -2517,5 +2517,10 @@ public final class CraftServer implements Server {
      public String getServerName() {
          return getProperties().serverName;
      }
diff --git a/patches/server/0016-Player-invulnerabilities.patch b/patches/server/0016-Player-invulnerabilities.patch
index e491ebc64..b6749ca57 100644
--- a/patches/server/0016-Player-invulnerabilities.patch
+++ b/patches/server/0016-Player-invulnerabilities.patch
@@ -108,7 +108,7 @@ index 2578a4677d1ee060f687be531e696b7c7be89e84..c441fcea9b2b5a77b801c8a69541cf42
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0d990988005a7e7cc3f45715bfd17f109357fe7b..f18faa5bf6eee873c921961578d256c6d625aec5 100644
+index 53d2c3e48dfbde9e409cf9e369ff9fa99908e1f2..0add9ab3dd03494fc73ea1afebf6bfc4a2dfe2b1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -2443,5 +2443,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0056-Configurable-TPS-Catchup.patch b/patches/server/0056-Configurable-TPS-Catchup.patch
index 172444935..76a8eddb1 100644
--- a/patches/server/0056-Configurable-TPS-Catchup.patch
+++ b/patches/server/0056-Configurable-TPS-Catchup.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable TPS Catchup
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 64cd02072536e69cd219932769bbade87b47601a..b795128c5a69f65883fdd318a8a5b2a65512bb16 100644
+index 659cfb528b8641f5a46a465898a716a7f0b2adf7..c61a487df3abc35f0e5a17c03e549ea7fe28656b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1003,7 +1003,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1008,7 +1008,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                      this.a(this::canSleepForTick);
                      this.methodProfiler.exitEnter("nextTickWait");
                      this.X = true;
diff --git a/patches/server/0073-Add-5-second-tps-average-in-tps.patch b/patches/server/0073-Add-5-second-tps-average-in-tps.patch
index f6c128c73..707811545 100644
--- a/patches/server/0073-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0073-Add-5-second-tps-average-in-tps.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add 5 second tps average in /tps
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b795128c5a69f65883fdd318a8a5b2a65512bb16..1296d06bd7c4abb3a43679e382e833199b5b54a2 100644
+index c61a487df3abc35f0e5a17c03e549ea7fe28656b..ba5e14bd8bed8c327d5560334d91ef2b6c501832 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -163,7 +163,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -164,7 +164,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      public static final int TPS = 20;
      public static final int TICK_TIME = 1000000000 / TPS;
      private static final int SAMPLE_INTERVAL = 20; // Paper
@@ -17,7 +17,7 @@ index b795128c5a69f65883fdd318a8a5b2a65512bb16..1296d06bd7c4abb3a43679e382e83319
      public boolean lagging = false; // Purpur
      public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
      // Spigot end
-@@ -886,6 +886,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -891,6 +891,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
      private long lastTick = 0;
      private long catchupTime = 0;
@@ -25,7 +25,7 @@ index b795128c5a69f65883fdd318a8a5b2a65512bb16..1296d06bd7c4abb3a43679e382e83319
      public final RollingAverage tps1 = new RollingAverage(60);
      public final RollingAverage tps5 = new RollingAverage(60 * 5);
      public final RollingAverage tps15 = new RollingAverage(60 * 15);
-@@ -978,13 +979,17 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -983,13 +984,17 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                      {
                          final long diff = curTime - tickSection;
                          java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);
@@ -47,10 +47,10 @@ index b795128c5a69f65883fdd318a8a5b2a65512bb16..1296d06bd7c4abb3a43679e382e83319
                          lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
                          tickSection = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 60af2c2770b5899edfe63d06829edceb5d7d3a71..999fb1ed13a6d50422738a43f2210287f74c2df4 100644
+index 4ad906b3ab91cee656c319d6c2deee59781ffe13..286e2964f672b75f18c48541ec1760eb9278bb1e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2295,6 +2295,7 @@ public final class CraftServer implements Server {
+@@ -2297,6 +2297,7 @@ public final class CraftServer implements Server {
      @Override
      public double[] getTPS() {
          return new double[] {
diff --git a/patches/server/0102-Ridables.patch b/patches/server/0102-Ridables.patch
index 4a6529a24..16cbb1c01 100644
--- a/patches/server/0102-Ridables.patch
+++ b/patches/server/0102-Ridables.patch
@@ -4898,10 +4898,10 @@ index dc9f2a1a132b3a7925bd62aa1da0512afd90b8b1..b7e540dfeeabb13227596ecfc6eddabf
              Entity entity1 = this.getShooter();
              // Paper start - Cancel hit for vanished players
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1296d06bd7c4abb3a43679e382e833199b5b54a2..eea187723c1931a5db9a2d79a1abddd664d890a1 100644
+index ba5e14bd8bed8c327d5560334d91ef2b6c501832..2487ff1ab50f45730a97f064b2dd8c0d19594dbd 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1411,6 +1411,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1416,6 +1416,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              WorldServer worldserver = (WorldServer) iterator.next();
              worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
              worldserver.hasEntityMoveEvent =  EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
diff --git a/patches/server/0146-Spread-out-and-optimise-player-list-ticks.patch b/patches/server/0146-Spread-out-and-optimise-player-list-ticks.patch
index b3b7009e6..654e845b6 100644
--- a/patches/server/0146-Spread-out-and-optimise-player-list-ticks.patch
+++ b/patches/server/0146-Spread-out-and-optimise-player-list-ticks.patch
@@ -56,7 +56,7 @@ index 779dbe4fd17499799794108336d9729a4fd4d76d..0a90b84d018f2a6f3f5185b6314ecc40
  
      public void sendAll(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f18faa5bf6eee873c921961578d256c6d625aec5..8b233caf0b799c6f0823bf6e854ce0f13cdc8b43 100644
+index 0add9ab3dd03494fc73ea1afebf6bfc4a2dfe2b1..d56b57dcef38dfe0246ea8614c24515b4c3356e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1451,7 +1451,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/patches/server/0152-Implement-TPSBar.patch b/patches/server/0152-Implement-TPSBar.patch
index 9845c5d6a..3a13a78eb 100644
--- a/patches/server/0152-Implement-TPSBar.patch
+++ b/patches/server/0152-Implement-TPSBar.patch
@@ -17,10 +17,10 @@ index b5cc099746e9f05ea69bc438bda22a5ac3ebc3c5..bbd17231a4f7ad0ddde6eb5e589a6c40
  
          if (commanddispatcher_servertype.d) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index eea187723c1931a5db9a2d79a1abddd664d890a1..33d43478b1bc4b0ca3f16ba80e0cd99bc6f5311e 100644
+index 2487ff1ab50f45730a97f064b2dd8c0d19594dbd..c9e72c424e315a2d98adaac0b8f0cf3a9e56cbed 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -469,6 +469,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -470,6 +470,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          this.serverConnection.acceptConnections();
          // CraftBukkit end
  
@@ -28,14 +28,14 @@ index eea187723c1931a5db9a2d79a1abddd664d890a1..33d43478b1bc4b0ca3f16ba80e0cd99b
      }
  
      protected void updateWorldSettings() {}
-@@ -862,6 +863,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -865,6 +866,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          this.safeShutdown(flag, false);
      }
      public void safeShutdown(boolean flag, boolean isRestarting) {
 +        net.pl3x.purpur.task.TPSBarTask.stop(); // Purpur
          this.isRunning = false;
          this.isRestarting = isRestarting;
-         if (flag) {
+         this.hasLoggedStop = true; // Paper
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
 index 0a90b84d018f2a6f3f5185b6314ecc4022b98010..8b70ff57ab54a4ff1544b7a7fee5cc6ad6f20d35 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
diff --git a/patches/server/0160-Add-EntityTeleportHinderedEvent.patch b/patches/server/0160-Add-EntityTeleportHinderedEvent.patch
index c505a3c31..b60923da6 100644
--- a/patches/server/0160-Add-EntityTeleportHinderedEvent.patch
+++ b/patches/server/0160-Add-EntityTeleportHinderedEvent.patch
@@ -123,7 +123,7 @@ index a3b810556e306bc2be65c7811cfa7806d5752cfa..f96c41fc8788ee7b674c18cc0fa692df
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8b233caf0b799c6f0823bf6e854ce0f13cdc8b43..301791a1f49028991713a125a6f0ee02f9a8e575 100644
+index d56b57dcef38dfe0246ea8614c24515b4c3356e7..f719624952d74fc5fa0ab4b5dd08bd0327f61d99 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -115,6 +115,7 @@ import org.bukkit.entity.EntityType;