From ec75e5964a5afd94b0d361a6aa260e04f33ad9bf Mon Sep 17 00:00:00 2001
From: BillyGalbreath <blake.galbreath@gmail.com>
Date: Sat, 24 Sep 2022 08:04:00 -0500
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@d332623 Avoid potential place where the world map could be modified after its iterator is created (#8315)
PaperMC/Paper@6736f39 Fix mangled patch
PaperMC/Paper@4d52f1d Add method isTickingWorlds to Bukkit (#8316)
PaperMC/Paper@62680d5 Avoid item meta usage for itemstack enchantment getter (#8373)
PaperMC/Paper@b4c025b Fix player desync on dimension change (#8253)
---
 gradle.properties                             |  2 +-
 patches/api/0004-Purpur-config-files.patch    |  4 ++--
 patches/api/0011-Bring-back-server-name.patch |  8 +++----
 patches/api/0014-Lagging-threshold.patch      |  8 +++----
 ...the-ability-to-add-combustible-items.patch |  8 +++----
 patches/api/0050-Debug-Marker-API.patch       |  8 +++----
 .../0001-Pufferfish-Server-Changes.patch      | 10 ++++----
 patches/server/0003-Rebrand.patch             |  8 +++----
 patches/server/0004-Purpur-config-files.patch | 10 ++++----
 .../0007-Component-related-conveniences.patch |  6 ++---
 patches/server/0008-Ridables.patch            |  8 +++----
 patches/server/0012-AFK-API.patch             |  4 ++--
 .../server/0013-Bring-back-server-name.patch  |  4 ++--
 .../0014-Configurable-server-mod-name.patch   |  4 ++--
 patches/server/0016-Lagging-threshold.patch   |  6 ++---
 .../0019-Player-invulnerabilities.patch       |  8 +++----
 ...0065-Add-5-second-tps-average-in-tps.patch |  6 ++---
 ...leport-to-spawn-if-outside-world-bor.patch |  8 +++----
 patches/server/0125-Implement-TPSBar.patch    |  6 ++---
 ...-to-ignore-nearby-mobs-when-sleeping.patch |  6 ++---
 patches/server/0210-Add-compass-command.patch |  6 ++---
 ...the-ability-to-add-combustible-items.patch |  4 ++--
 .../server/0238-Signs-allow-color-codes.patch |  4 ++--
 .../0286-Allow-custom-ChatDecorators.patch    |  4 ++--
 patches/server/0287-Cache-server-motd.patch   |  4 ++--
 patches/server/0288-Remove-Timings.patch      | 16 ++++++-------
 .../server/0289-Remove-Mojang-Profiler.patch  | 24 +++++++++----------
 patches/server/0292-Debug-Marker-API.patch    |  4 ++--
 28 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 353e94a0c..f280584fd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19.2-R0.1-SNAPSHOT
 
-paperCommit = 3996e6ef29dcc891dd915222e7ab82aae4b9ede9
+paperCommit = b4c025b92c48fb2b55a7433f85627184aee5d90a
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/api/0004-Purpur-config-files.patch b/patches/api/0004-Purpur-config-files.patch
index 9409cf4b4..2c2dc917c 100644
--- a/patches/api/0004-Purpur-config-files.patch
+++ b/patches/api/0004-Purpur-config-files.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index da5cab4246bd253fcc4e4d9574bdae1867ebb5ab..acca0fea7037232bbc95c4c945b1621db3026feb 100644
+index 1982fc2d7f1cb80d3e324ee283211b251a976c6e..61590b93f07b8b197b5ea69423e9cfb7a149c0e6 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1948,6 +1948,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1969,6 +1969,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Paper end
  
diff --git a/patches/api/0011-Bring-back-server-name.patch b/patches/api/0011-Bring-back-server-name.patch
index edc5419da..ad894d966 100644
--- a/patches/api/0011-Bring-back-server-name.patch
+++ b/patches/api/0011-Bring-back-server-name.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 840aaf9e8fc828b5a7ea02252038c6524680f2e0..5110ff0ffb2f4a42a0f5a11117d18c445e3c9711 100644
+index b5a7d6ab4e458843f2e163bf06b5668627012f91..d76cfd8fbc96a592f79d2ffaf838268b2aade1b2 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2442,4 +2442,15 @@ public final class Bukkit {
+@@ -2462,4 +2462,15 @@ public final class Bukkit {
      public static Server.Spigot spigot() {
          return server.spigot();
      }
@@ -25,10 +25,10 @@ index 840aaf9e8fc828b5a7ea02252038c6524680f2e0..5110ff0ffb2f4a42a0f5a11117d18c44
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index acca0fea7037232bbc95c4c945b1621db3026feb..046380115fb3f94d78a420c5197dc89a3a813140 100644
+index 61590b93f07b8b197b5ea69423e9cfb7a149c0e6..025503596d9febf8d76c82b4fe940e8661de9dce 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2128,4 +2128,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2149,4 +2149,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
      // Paper end
diff --git a/patches/api/0014-Lagging-threshold.patch b/patches/api/0014-Lagging-threshold.patch
index 4d1d68af0..a79325022 100644
--- a/patches/api/0014-Lagging-threshold.patch
+++ b/patches/api/0014-Lagging-threshold.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 5110ff0ffb2f4a42a0f5a11117d18c445e3c9711..e55a927e3171cf7f7dbd328790cc522b3b4eb08a 100644
+index d76cfd8fbc96a592f79d2ffaf838268b2aade1b2..b507eb5bccf3689cc28a7bce7f4e31114b52a342 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2452,5 +2452,14 @@ public final class Bukkit {
+@@ -2472,5 +2472,14 @@ public final class Bukkit {
      public static String getServerName() {
          return server.getServerName();
      }
@@ -24,10 +24,10 @@ index 5110ff0ffb2f4a42a0f5a11117d18c445e3c9711..e55a927e3171cf7f7dbd328790cc522b
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 046380115fb3f94d78a420c5197dc89a3a813140..d69a29109b5c991474ff7d59c02bf9a37aa7002f 100644
+index 025503596d9febf8d76c82b4fe940e8661de9dce..6843701a22af21d0610bfa1c0eb85f8b0fed82df 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2136,5 +2136,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2157,5 +2157,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      String getServerName();
diff --git a/patches/api/0041-Added-the-ability-to-add-combustible-items.patch b/patches/api/0041-Added-the-ability-to-add-combustible-items.patch
index 850a3478c..09905ab7e 100644
--- a/patches/api/0041-Added-the-ability-to-add-combustible-items.patch
+++ b/patches/api/0041-Added-the-ability-to-add-combustible-items.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Added the ability to add combustible items
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index e55a927e3171cf7f7dbd328790cc522b3b4eb08a..f2fc1042bcd1a98b97e8af3fbb7133f0963321f2 100644
+index b507eb5bccf3689cc28a7bce7f4e31114b52a342..581c797b660cd190dc368a4d3f1c01717e98a4a6 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2461,5 +2461,24 @@ public final class Bukkit {
+@@ -2481,5 +2481,24 @@ public final class Bukkit {
      public static boolean isLagging() {
          return server.isLagging();
      }
@@ -34,10 +34,10 @@ index e55a927e3171cf7f7dbd328790cc522b3b4eb08a..f2fc1042bcd1a98b97e8af3fbb7133f0
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d69a29109b5c991474ff7d59c02bf9a37aa7002f..032ed217706fd27beb4d8247b77e5b7c0381bd04 100644
+index 6843701a22af21d0610bfa1c0eb85f8b0fed82df..7b499d4501e2123b22fd8311c68b8f7b3c41beed 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2143,5 +2143,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2164,5 +2164,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return True if lagging
       */
      boolean isLagging();
diff --git a/patches/api/0050-Debug-Marker-API.patch b/patches/api/0050-Debug-Marker-API.patch
index ec65ab657..d5674b7ab 100644
--- a/patches/api/0050-Debug-Marker-API.patch
+++ b/patches/api/0050-Debug-Marker-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Debug Marker API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index f2fc1042bcd1a98b97e8af3fbb7133f0963321f2..a3e22c90f856ad215bab4e0f308e46cd4c4b06db 100644
+index 581c797b660cd190dc368a4d3f1c01717e98a4a6..827ff8d71391a7e7b4273c85fe3b6601dab68f77 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2480,5 +2480,89 @@ public final class Bukkit {
+@@ -2500,5 +2500,89 @@ public final class Bukkit {
      public static void removeFuel(@NotNull Material material) {
          server.removeFuel(material);
      }
@@ -99,10 +99,10 @@ index f2fc1042bcd1a98b97e8af3fbb7133f0963321f2..a3e22c90f856ad215bab4e0f308e46cd
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 032ed217706fd27beb4d8247b77e5b7c0381bd04..fea1283dcbac2794402bcd97f072ad3f84fcced1 100644
+index 7b499d4501e2123b22fd8311c68b8f7b3c41beed..0e4d5345a5590d1a5d98cf11eb6e3649303c3ebb 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2158,5 +2158,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2179,5 +2179,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @param material The material that will no longer be a fuel
       */
      public void removeFuel(@NotNull Material material);
diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch
index fcdffde45..512f79f1d 100644
--- a/patches/server/0001-Pufferfish-Server-Changes.patch
+++ b/patches/server/0001-Pufferfish-Server-Changes.patch
@@ -2783,7 +2783,7 @@ index 6939ef9b1fe782980e77c351d8a385a573d6a8e6..e9f0ddf1a34bf3b0d868b53e4439d9d9
  
      public static long getCoordinateKey(final ChunkPos pair) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d2161a3c3b9a2b2d463ac778656c95167c10a49d..92f685b1b6015cdd3e6c50fd39a79e2ad187fc91 100644
+index 055ba929341889f9ab57d649beffa6e92feb6e53..67e150e35d328eb13c8f86e61dab2f11c76b21df 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -298,6 +298,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2795,7 +2795,7 @@ index d2161a3c3b9a2b2d463ac778656c95167c10a49d..92f685b1b6015cdd3e6c50fd39a79e2a
  
      public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
          AtomicReference<S> atomicreference = new AtomicReference();
-@@ -1673,7 +1675,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1674,7 +1676,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
@@ -2804,7 +2804,7 @@ index d2161a3c3b9a2b2d463ac778656c95167c10a49d..92f685b1b6015cdd3e6c50fd39a79e2a
      }
  
      public SystemReport fillSystemReport(SystemReport details) {
-@@ -2252,6 +2254,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2253,6 +2255,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public ProfilerFiller getProfiler() {
@@ -5726,7 +5726,7 @@ index b1992ed5136cc7dcf04219868b94b3c37ae36b4b..5b5339cba819368f4d6b7eaf404fa59b
  
      @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b443aba38258f501f8f00be6b055f07b709277c4..660d3f6e8a59751aa1d5b71f5bab72254b6065b8 100644
+index 29a69edc642820b30a842cc580f48c49dfe96eec..ff520a7fa8235a46d861df60569077be258d7cb1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper
@@ -5738,7 +5738,7 @@ index b443aba38258f501f8f00be6b055f07b709277c4..660d3f6e8a59751aa1d5b71f5bab7225
      private final String serverVersion;
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
-@@ -1047,6 +1047,11 @@ public final class CraftServer implements Server {
+@@ -1052,6 +1052,11 @@ public final class CraftServer implements Server {
                  plugin.getDescription().getName(),
                  "This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
              ));
diff --git a/patches/server/0003-Rebrand.patch b/patches/server/0003-Rebrand.patch
index d5cee0f55..afa39770c 100644
--- a/patches/server/0003-Rebrand.patch
+++ b/patches/server/0003-Rebrand.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 7074295d7399d03e259598bb4bfa0f21434d74be..dc00d06f9bd4cc7403e0fe89822ed40ed2e148c8 100644
+index 26f8979c1a150159823be1693cf2aa5366401015..441a18132eb60e1af8b624ab7cf3de61669ced1f 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -9,7 +9,7 @@ plugins {
@@ -168,7 +168,7 @@ index abe37c7c3c6f5ab73afd738ec78f06d7e4d2ed96..b5b6657e52e4f7a630229bd3ba433438
          stringbuilder.append(CrashReport.getErrorComment());
          stringbuilder.append("\n\n");
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 92f685b1b6015cdd3e6c50fd39a79e2ad187fc91..98a166edfda01f5e07a144a34fd57f0e83b8893c 100644
+index 67e150e35d328eb13c8f86e61dab2f11c76b21df..cb907fe3988705e5dd961a9b9b2cbc9321e59d69 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -298,7 +298,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -189,7 +189,7 @@ index 92f685b1b6015cdd3e6c50fd39a79e2ad187fc91..98a166edfda01f5e07a144a34fd57f0e
              while (this.getRunningThread().isAlive()) {
                  this.getRunningThread().stop();
                  try {
-@@ -1675,7 +1675,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1676,7 +1676,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
@@ -231,7 +231,7 @@ index c2356ed1a00fd8087cca285be5e7f6a5442e73fb..13399302916bbf39cd08cfcefaf3358a
  
      private static final int DEFAULT_SIZE_THRESHOLD = 1024 * 8;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 660d3f6e8a59751aa1d5b71f5bab72254b6065b8..0ab7d6b9fa8c1eca9b2e3b2548c37b444e1576dc 100644
+index ff520a7fa8235a46d861df60569077be258d7cb1..f9b2b6f8bededc5d87fcaac59ff14bac7d76073b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper
diff --git a/patches/server/0004-Purpur-config-files.patch b/patches/server/0004-Purpur-config-files.patch
index 2b5601e31..bf37ef11f 100644
--- a/patches/server/0004-Purpur-config-files.patch
+++ b/patches/server/0004-Purpur-config-files.patch
@@ -105,10 +105,10 @@ index 29a2ba6b84c01280f8c7f32e6a78e3dd6c53cb07..544f7ff70486c31e9caddf574265a42c
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0ab7d6b9fa8c1eca9b2e3b2548c37b444e1576dc..742c65fe400977ad7087f6756b6a80617fff2bfc 100644
+index f9b2b6f8bededc5d87fcaac59ff14bac7d76073b..27b423da045bbe840b81ccca1729eba047e24d3d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -961,6 +961,7 @@ public final class CraftServer implements Server {
+@@ -966,6 +966,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
@@ -116,7 +116,7 @@ index 0ab7d6b9fa8c1eca9b2e3b2548c37b444e1576dc..742c65fe400977ad7087f6756b6a8061
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -976,6 +977,7 @@ public final class CraftServer implements Server {
+@@ -981,6 +982,7 @@ public final class CraftServer implements Server {
                  }
              }
              world.spigotConfig.init(); // Spigot
@@ -124,7 +124,7 @@ index 0ab7d6b9fa8c1eca9b2e3b2548c37b444e1576dc..742c65fe400977ad7087f6756b6a8061
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -991,6 +993,7 @@ public final class CraftServer implements Server {
+@@ -996,6 +998,7 @@ public final class CraftServer implements Server {
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -132,7 +132,7 @@ index 0ab7d6b9fa8c1eca9b2e3b2548c37b444e1576dc..742c65fe400977ad7087f6756b6a8061
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2736,6 +2739,18 @@ public final class CraftServer implements Server {
+@@ -2741,6 +2744,18 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
  
diff --git a/patches/server/0007-Component-related-conveniences.patch b/patches/server/0007-Component-related-conveniences.patch
index 0b53a842a..e3fbf71df 100644
--- a/patches/server/0007-Component-related-conveniences.patch
+++ b/patches/server/0007-Component-related-conveniences.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Component related conveniences
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 266a26d73dd5aec427b64a638693decf70ea36cb..2049fa1008be5208d9bb168dd65483613a7296f1 100644
+index 3300a10b2558651c68fac18939815eb45889152b..a16f72e34af8cfef50622dba18750926ace1008e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1704,6 +1704,26 @@ public class ServerPlayer extends Player {
+@@ -1705,6 +1705,26 @@ public class ServerPlayer extends Player {
          this.lastSentExp = -1; // CraftBukkit - Added to reset
      }
  
@@ -81,7 +81,7 @@ index 67bce77093dcc126098731047447da2031e3388d..c4088446d30c3b25cf196f51fd394cd0
          return this.isFireSource;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 417570c2ad71bc3727e7d5eb841a92ec815d12f6..47b4c0009fd3c9ec56cac0897c10aac96b6893ad 100644
+index 4971ec79a114fd0d7540eaa0ef54b18c4bfbea57..4a069182f6cc3b40f6b5eabb85f70365bd9bfdcc 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3797,6 +3797,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0008-Ridables.patch b/patches/server/0008-Ridables.patch
index ed54ef307..ce1cd07f3 100644
--- a/patches/server/0008-Ridables.patch
+++ b/patches/server/0008-Ridables.patch
@@ -22,10 +22,10 @@ index 153451ecd5b3c8e8ecb2d5ec91ccd582d4300899..56536c39bccfe097f8227c74a0d16799
          super(x, y, z);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 98a166edfda01f5e07a144a34fd57f0e83b8893c..50d077470a3a606b97ea4ae499837de654ecb984 100644
+index cb907fe3988705e5dd961a9b9b2cbc9321e59d69..6845b05225cd679d7b40695455f4ea651507787e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1536,6 +1536,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1537,6 +1537,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
              worldserver.hasEntityMoveEvent =  io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
@@ -46,7 +46,7 @@ index 42c88ef31474690c95f7cfe7c3075e1f854c4005..738ffcc9f8ec1b34e7e1357ae48283e3
          return new Throwable(entity + " Added to world at " + new java.util.Date());
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 2049fa1008be5208d9bb168dd65483613a7296f1..8e3e3dbbea328f76a790477545b46d2d3013546b 100644
+index a16f72e34af8cfef50622dba18750926ace1008e..f9c77e5280950af9b6d650041b14c501657b8669 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -670,6 +670,15 @@ public class ServerPlayer extends Player {
@@ -79,7 +79,7 @@ index 184c5540e519edd0430ae586bfae93d3ff798de2..b5e3f57a1a8875c33c3a01a525efc692
                          if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
                              ServerGamePacketListenerImpl.this.send(new ClientboundAddEntityPacket(entity));
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 47b4c0009fd3c9ec56cac0897c10aac96b6893ad..02c44ec7b6891763daef41f59334c5c47ae4e98d 100644
+index 4a069182f6cc3b40f6b5eabb85f70365bd9bfdcc..8dd2710b7db50d74c53ded1fbf23dccf32e41357 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -362,7 +362,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0012-AFK-API.patch b/patches/server/0012-AFK-API.patch
index dfea5cfeb..6b4abe4ad 100644
--- a/patches/server/0012-AFK-API.patch
+++ b/patches/server/0012-AFK-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8e3e3dbbea328f76a790477545b46d2d3013546b..905aa1311791564720e541fc4fbe1e4f8d38a0e7 100644
+index f9c77e5280950af9b6d650041b14c501657b8669..4c1c5b43b5080ff860ee511d00dc9fdd6cab8b7b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2001,8 +2001,58 @@ public class ServerPlayer extends Player {
+@@ -2002,8 +2002,58 @@ public class ServerPlayer extends Player {
  
      public void resetLastActionTime() {
          this.lastActionTime = Util.getMillis();
diff --git a/patches/server/0013-Bring-back-server-name.patch b/patches/server/0013-Bring-back-server-name.patch
index 77bcc7ea0..e3c3797a0 100644
--- a/patches/server/0013-Bring-back-server-name.patch
+++ b/patches/server/0013-Bring-back-server-name.patch
@@ -17,10 +17,10 @@ index a32cfa75a9bea896f558bab646d0868391b069a9..01ca7156d86243a80cd343a2a66be9eb
      public final boolean spawnNpcs = this.get("spawn-npcs", true);
      public final boolean pvp = this.get("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c1a8ac2abf79075f4ea70d2cfe1fc577e0e92271..0f441589561bff0d2f21bf1a1d764422a34ecbee 100644
+index 27b423da045bbe840b81ccca1729eba047e24d3d..c008d4b5b57571ed594c7a6bf9307836d620f5ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2926,4 +2926,11 @@ public final class CraftServer implements Server {
+@@ -2931,4 +2931,11 @@ public final class CraftServer implements Server {
      }
  
      // Paper end
diff --git a/patches/server/0014-Configurable-server-mod-name.patch b/patches/server/0014-Configurable-server-mod-name.patch
index 019eb7dda..9f7d29a2e 100644
--- a/patches/server/0014-Configurable-server-mod-name.patch
+++ b/patches/server/0014-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 50d077470a3a606b97ea4ae499837de654ecb984..28550587d7b3f3fd48b2ebaaafd8ed847a86082f 100644
+index 6845b05225cd679d7b40695455f4ea651507787e..081c35af457bd7a0a2bca8bf6428e26b0e4c2207 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1676,7 +1676,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1677,7 +1677,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
  
      @DontObfuscate
      public String getServerModName() {
diff --git a/patches/server/0016-Lagging-threshold.patch b/patches/server/0016-Lagging-threshold.patch
index 33aa26e99..37c1198a2 100644
--- a/patches/server/0016-Lagging-threshold.patch
+++ b/patches/server/0016-Lagging-threshold.patch
@@ -5,7 +5,7 @@ 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 28550587d7b3f3fd48b2ebaaafd8ed847a86082f..610f3ba3a983144b8b7f56e39d1c60bde6f35491 100644
+index 081c35af457bd7a0a2bca8bf6428e26b0e4c2207..3681155a741d0c5632eb0e62c4baec6b96d4c480 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -294,6 +294,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -25,10 +25,10 @@ index 28550587d7b3f3fd48b2ebaaafd8ed847a86082f..610f3ba3a983144b8b7f56e39d1c60bd
                  }
                  // Spigot end
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7e66b58c607257ba4b7c047291b6bf115d5a200d..9bfd75df68a6cbad81cf933a448f5741d9d90b92 100644
+index c008d4b5b57571ed594c7a6bf9307836d620f5ae..a7a5ea76d623d7e9f1bee2d420544a988a44f977 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2932,5 +2932,10 @@ public final class CraftServer implements Server {
+@@ -2937,5 +2937,10 @@ public final class CraftServer implements Server {
      public String getServerName() {
          return this.getProperties().serverName;
      }
diff --git a/patches/server/0019-Player-invulnerabilities.patch b/patches/server/0019-Player-invulnerabilities.patch
index d29ff828a..a6108c325 100644
--- a/patches/server/0019-Player-invulnerabilities.patch
+++ b/patches/server/0019-Player-invulnerabilities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 905aa1311791564720e541fc4fbe1e4f8d38a0e7..577a8a033c13832bc9cf5783b8cd6d470002c2a2 100644
+index 4c1c5b43b5080ff860ee511d00dc9fdd6cab8b7b..d504c6efe13681f4d62862074d49d7c2b99f5fe5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -263,6 +263,7 @@ public class ServerPlayer extends Player {
@@ -46,7 +46,7 @@ index 905aa1311791564720e541fc4fbe1e4f8d38a0e7..577a8a033c13832bc9cf5783b8cd6d47
                  return false;
              } else {
                  if (source instanceof EntityDamageSource) {
-@@ -1198,6 +1206,7 @@ public class ServerPlayer extends Player {
+@@ -1199,6 +1207,7 @@ public class ServerPlayer extends Player {
              }
              // Paper end
  
@@ -54,7 +54,7 @@ index 905aa1311791564720e541fc4fbe1e4f8d38a0e7..577a8a033c13832bc9cf5783b8cd6d47
              return this;
          }
      }
-@@ -1987,6 +1996,7 @@ public class ServerPlayer extends Player {
+@@ -1988,6 +1997,7 @@ public class ServerPlayer extends Player {
      }
  
      public void sendTexturePack(String url, String hash, boolean required, @Nullable Component resourcePackPrompt) {
@@ -62,7 +62,7 @@ index 905aa1311791564720e541fc4fbe1e4f8d38a0e7..577a8a033c13832bc9cf5783b8cd6d47
          this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt));
      }
  
-@@ -2512,9 +2522,17 @@ public class ServerPlayer extends Player {
+@@ -2513,9 +2523,17 @@ public class ServerPlayer extends Player {
  
      @Override
      public boolean isImmobile() {
diff --git a/patches/server/0065-Add-5-second-tps-average-in-tps.patch b/patches/server/0065-Add-5-second-tps-average-in-tps.patch
index a4d63a628..94c03fe0c 100644
--- a/patches/server/0065-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0065-Add-5-second-tps-average-in-tps.patch
@@ -27,7 +27,7 @@ index fa56cd09102a89692b42f1d14257990508c5c720..f9251183df72ddc56662fd3f02acf216
          setListData(vector);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9ff46c460f09bf3e62f958a4a87632d59a310e24..b1098555ea7c96815dc85ab440544d9db7fee978 100644
+index 79fa0e88f24857b9ff1e02e550d219f5ed6e4cda..db7646f82ccbda375ddb57dbfd4e5c1baec95184 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -290,7 +290,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -69,10 +69,10 @@ index 9ff46c460f09bf3e62f958a4a87632d59a310e24..b1098555ea7c96815dc85ab440544d9d
                          lagging = recentTps[0] < org.purpurmc.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 9bfd75df68a6cbad81cf933a448f5741d9d90b92..f61aa1a5139c1a39c6825a135a48e9cc937b0671 100644
+index a7a5ea76d623d7e9f1bee2d420544a988a44f977..f3bbfc995366eb710082afe40b4d51533f6016ea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2693,6 +2693,7 @@ public final class CraftServer implements Server {
+@@ -2698,6 +2698,7 @@ public final class CraftServer implements Server {
      @Override
      public double[] getTPS() {
          return new double[] {
diff --git a/patches/server/0079-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0079-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
index def278d64..f46757bff 100644
--- a/patches/server/0079-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
+++ b/patches/server/0079-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index de96a37827fd31f3189e18298e2f9e1370761a30..0d30b21ec070980b290f23d5becfc61183214146 100644
+index 8ddbe1b4c19e4736208d17f7f76f52c4c7db354c..7d4475a89475b4c8324733a0f7f6b673501c2267 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2583,4 +2583,26 @@ public class ServerPlayer extends Player {
+@@ -2584,4 +2584,26 @@ public class ServerPlayer extends Player {
      // CraftBukkit end
  
      public final int getViewDistance() { throw new UnsupportedOperationException("Use PlayerChunkLoader"); } // Paper - placeholder
@@ -36,7 +36,7 @@ index de96a37827fd31f3189e18298e2f9e1370761a30..0d30b21ec070980b290f23d5becfc611
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ae8b34336a2e9e58c79eb1435ed7520dd180f302..c9dd775e01da040ac6c97c0ee0147828f1cc7fdd 100644
+index 0f54b1f6024ea4a3d1bb0a86015a084f9c298c7c..fa2404a02d32b8fdcd3a9134bde58c683d542bca 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -44,6 +44,7 @@ import net.minecraft.network.syncher.EntityDataAccessor;
@@ -56,7 +56,7 @@ index ae8b34336a2e9e58c79eb1435ed7520dd180f302..c9dd775e01da040ac6c97c0ee0147828
                      }
                  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 74bdd1a79dd3a911d3d4fb4b7a31454f64aa274a..68d87cd69a830a4b5e15b31a43ab0a80f07fe7cc 100644
+index 3243c8aa7fc710d655f12de6e995d604710f2122..c1427f1902d3eca6bec8c3f0a1503ec1a28baf6b 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -246,6 +246,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0125-Implement-TPSBar.patch b/patches/server/0125-Implement-TPSBar.patch
index b8aeca412..ae403760a 100644
--- a/patches/server/0125-Implement-TPSBar.patch
+++ b/patches/server/0125-Implement-TPSBar.patch
@@ -17,7 +17,7 @@ index ab0f00128f8c1b13c3eb5787df0c4e26372e0734..14b12cb6967c1c2735cf6a0eafdf6e23
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index eb12fed7ee6d7d3a5f5b9e99d8f11b38122cac7e..872632875d1569dd348c78983b260ebeb746b829 100644
+index 635e02597e8f57f80eadc1ec78d87b9742c01406..10f33aed80fd963accbac1f43fd9b392d4452fb9 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1050,6 +1050,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -41,7 +41,7 @@ index 629024e5c3f480bd50ae2df9dadb72f06a62c3bf..19bf680e222d7f91a0e7f67b29e3a5e3
          }
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 725358518b73b908c8150bdbabed68909c91f4d4..b858ce2ad443f6690dd71e56fb9eea14793df19d 100644
+index 6036db50f05e8658f645848e03b276a1352a9424..e8663f8f23f71cfabde12585c6d9bc8215eb21e3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -264,6 +264,7 @@ public class ServerPlayer extends Player {
@@ -68,7 +68,7 @@ index 725358518b73b908c8150bdbabed68909c91f4d4..b858ce2ad443f6690dd71e56fb9eea14
      }
  
      // CraftBukkit start - World fallback code, either respawn location or global spawn
-@@ -2613,5 +2616,13 @@ public class ServerPlayer extends Player {
+@@ -2614,5 +2617,13 @@ public class ServerPlayer extends Player {
              this.server.getPlayerList().respawn(this, toLevel, true, to, !toLevel.paperConfig().environment.disableTeleportationSuffocationCheck);
          }
      }
diff --git a/patches/server/0143-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0143-Config-to-ignore-nearby-mobs-when-sleeping.patch
index f52a0a23c..2e14d2da2 100644
--- a/patches/server/0143-Config-to-ignore-nearby-mobs-when-sleeping.patch
+++ b/patches/server/0143-Config-to-ignore-nearby-mobs-when-sleeping.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5406bff8bc2e194c93076f1d8d51f75f8c6e57d3..5d27110793a95118fae2e671e6f9cdede0763216 100644
+index 6f36354c424f91e7bfbb4619ff03a32d69b9f595..ad2ac7b21296c6995b548fd3c4bf128cd0eb809c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1340,7 +1340,7 @@ public class ServerPlayer extends Player {
+@@ -1341,7 +1341,7 @@ public class ServerPlayer extends Player {
                              return entitymonster.isPreventingPlayerRest(this);
                          });
  
@@ -18,7 +18,7 @@ index 5406bff8bc2e194c93076f1d8d51f75f8c6e57d3..5d27110793a95118fae2e671e6f9cded
                          }
                      }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 58ef5df9b6a494905434699f73fa848a85f4a52c..8e6e5da5c089644136b365fb65df54c6f64ae44c 100644
+index abb38209f5596fe741d11415db93b231c3b90085..7cd24f545da327d537f79cde3170477a24102a45 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -353,6 +353,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0210-Add-compass-command.patch b/patches/server/0210-Add-compass-command.patch
index a6d85e8ca..fcf7879c5 100644
--- a/patches/server/0210-Add-compass-command.patch
+++ b/patches/server/0210-Add-compass-command.patch
@@ -17,7 +17,7 @@ index 6a044a9c97db9bba75f8dbbaa8515e3167841855..edd378813873ed367784379b0f1666d1
  
          if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 18e5d1440de271571940795b074cbcd027dc6a19..68008facb6cfcccbcb7501c84c5da9014321ce4a 100644
+index 2e886f8f56cda44d74bac7028236273e811d4473..ff4c7dcb2734b120026b19bd63d8fdcd5cad12f1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -265,6 +265,7 @@ public class ServerPlayer extends Player {
@@ -44,7 +44,7 @@ index 18e5d1440de271571940795b074cbcd027dc6a19..68008facb6cfcccbcb7501c84c5da901
      }
  
      // CraftBukkit start - World fallback code, either respawn location or global spawn
-@@ -2626,5 +2629,13 @@ public class ServerPlayer extends Player {
+@@ -2627,5 +2630,13 @@ public class ServerPlayer extends Player {
      public void tpsBar(boolean tpsBar) {
          this.tpsBar = tpsBar;
      }
@@ -89,7 +89,7 @@ index c1b7b01c7588cffed238143617dcf2f48a0b241a..c36321f395c7845c73541fa1eb320da7
          hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector);
          uptimeFormat = getString("settings.command.uptime.format", uptimeFormat);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 90c70d233327615004fc22cde6b9d71660bb0a5b..64340213b2122ddc2e39eeac628b69d6f87c7a8f 100644
+index a1a348aef3060ebe9f61108721a5a8338b58d1c2..30aa0a04da9db4841daeddead8776322968f22a9 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -222,6 +222,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0224-Added-the-ability-to-add-combustible-items.patch b/patches/server/0224-Added-the-ability-to-add-combustible-items.patch
index 79cf8ac2d..8833bd03e 100644
--- a/patches/server/0224-Added-the-ability-to-add-combustible-items.patch
+++ b/patches/server/0224-Added-the-ability-to-add-combustible-items.patch
@@ -51,10 +51,10 @@ index c617a8aacbbefb37d53d0e005e822469d29aa642..e1abe61edfaa7b1497b5367310b49146
      private int maxStack = MAX_STACK;
      public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 85bac0c88b981d6bfec0e36066779ee8c4ed0583..67bde88d7921248a1dd6f36386a290e7ac1e9ecc 100644
+index f3bbfc995366eb710082afe40b4d51533f6016ea..9c9826005a444f9877efe2b01a5ae9bd83578422 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1421,6 +1421,19 @@ public final class CraftServer implements Server {
+@@ -1426,6 +1426,19 @@ public final class CraftServer implements Server {
          return true;
      }
  
diff --git a/patches/server/0238-Signs-allow-color-codes.patch b/patches/server/0238-Signs-allow-color-codes.patch
index 99a4edbd8..b02f9f57d 100644
--- a/patches/server/0238-Signs-allow-color-codes.patch
+++ b/patches/server/0238-Signs-allow-color-codes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Signs allow color codes
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 68008facb6cfcccbcb7501c84c5da9014321ce4a..4d28a1f9fe43bb8e9f5ffaf06895c94fa0749d5d 100644
+index ff4c7dcb2734b120026b19bd63d8fdcd5cad12f1..3b5b040cf3cdbb3798972f73b75e8ab4753987db 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1515,6 +1515,7 @@ public class ServerPlayer extends Player {
+@@ -1516,6 +1516,7 @@ public class ServerPlayer extends Player {
  
      @Override
      public void openTextEdit(SignBlockEntity sign) {
diff --git a/patches/server/0286-Allow-custom-ChatDecorators.patch b/patches/server/0286-Allow-custom-ChatDecorators.patch
index cc274d33c..024b678cd 100644
--- a/patches/server/0286-Allow-custom-ChatDecorators.patch
+++ b/patches/server/0286-Allow-custom-ChatDecorators.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Allow custom ChatDecorators
 Requires NMS to utilize. I'll write an API for this once our upstreams calm down with the changes.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ad75fb1e1d8c91b46c98fc666f12b72fcdfb0df9..8f1d6493700365d651c915f78e34fd5b13264c3c 100644
+index 121530170b268d54c2e7eb69263c254201996793..1fef8e7e8d3fda031cc0cd8573edcae1ab8d06d3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2646,6 +2646,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2647,6 +2647,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              new com.google.common.util.concurrent.ThreadFactoryBuilder().setDaemon(true).setNameFormat("Async Chat Thread - #%d").setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(net.minecraft.server.MinecraftServer.LOGGER)).build()); // Paper
  
      public ChatDecorator getChatDecorator() {
diff --git a/patches/server/0287-Cache-server-motd.patch b/patches/server/0287-Cache-server-motd.patch
index afce871ab..7f13abaec 100644
--- a/patches/server/0287-Cache-server-motd.patch
+++ b/patches/server/0287-Cache-server-motd.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Cache server motd
 Paper ported my patch in an odd way. Keeping my patch around to reduce logic on the motd getter
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8f1d6493700365d651c915f78e34fd5b13264c3c..63660814d0ba4090f52146119707f04d8b905f18 100644
+index 1fef8e7e8d3fda031cc0cd8573edcae1ab8d06d3..f018d4bec5e09118b99933b58efe24da995fde75 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -234,7 +234,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -18,7 +18,7 @@ index 8f1d6493700365d651c915f78e34fd5b13264c3c..63660814d0ba4090f52146119707f04d
      private int playerIdleTimeout;
      public final long[] tickTimes;
      // Paper start
-@@ -1903,17 +1903,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1904,17 +1904,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public net.kyori.adventure.text.Component getComponentMotd() {
diff --git a/patches/server/0288-Remove-Timings.patch b/patches/server/0288-Remove-Timings.patch
index 22bde5aa0..670c92a33 100644
--- a/patches/server/0288-Remove-Timings.patch
+++ b/patches/server/0288-Remove-Timings.patch
@@ -58,7 +58,7 @@ index 0d245ad7d19b11e946e0b5b43bf2181292297210..49f3a4e66ea38e80f809607100350051
  
              return; // the main thread will now complete the data
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index bc72131afa1ae9986ee311a9b371e97c8feb38f8..538bf435a4307a166bf6d926f71f391f620233f0 100644
+index 2eb30c6c6f1354a559a7b8c14c36a9970bdf2a42..d9f5f48fbb67d7f8dbfc0b7fa8fe0c294a7e8f0d 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -68,14 +68,14 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -103,7 +103,7 @@ index 8bc0cb9ad5bb4e76d962ff54305e2c08e279a17b..e8efbbeece7e866c6c4d7489677d2d9e
                      PacketUtils.LOGGER.debug("Ignoring packet due to disconnection: {}", packet);
                  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 63660814d0ba4090f52146119707f04d8b905f18..c340f7577435d59ae46455a2b94521bc401aeaa9 100644
+index f018d4bec5e09118b99933b58efe24da995fde75..d1987cfa0b1bd60cb6d3145d9522216d72f253cc 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1428,15 +1428,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -158,7 +158,7 @@ index 63660814d0ba4090f52146119707f04d8b905f18..c340f7577435d59ae46455a2b94521bc
 -        MinecraftTimings.commandFunctionsTimer.stopTiming(); // Spigot // Paper
 +        //MinecraftTimings.commandFunctionsTimer.stopTiming(); // Spigot // Paper // Purpur
          this.profiler.popPush("levels");
-         Iterator iterator = this.getAllLevels().iterator();
+         //Iterator iterator = this.getAllLevels().iterator(); // Paper - moved down
  
          // CraftBukkit start
          // Run tasks that are waiting on processing
@@ -183,8 +183,8 @@ index 63660814d0ba4090f52146119707f04d8b905f18..c340f7577435d59ae46455a2b94521bc
 +        //MinecraftTimings.timeUpdateTimer.stopTiming(); // Spigot // Paper // Purpur
  
          this.isIteratingOverLevels = true; // Paper
-         while (iterator.hasNext()) {
-@@ -1578,14 +1578,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+         Iterator iterator = this.getAllLevels().iterator(); // Paper - move down
+@@ -1579,14 +1579,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.profiler.push("tick");
  
              try {
@@ -201,7 +201,7 @@ index 63660814d0ba4090f52146119707f04d8b905f18..c340f7577435d59ae46455a2b94521bc
              } catch (Throwable throwable) {
                  // Spigot Start
                  CrashReport crashreport;
-@@ -1608,24 +1608,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1609,24 +1609,24 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          this.isIteratingOverLevels = false; // Paper
  
          this.profiler.popPush("connection");
@@ -232,7 +232,7 @@ index 63660814d0ba4090f52146119707f04d8b905f18..c340f7577435d59ae46455a2b94521bc
  
          this.profiler.pop();
      }
-@@ -2784,7 +2784,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2785,7 +2785,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              return;
          }
  
@@ -241,7 +241,7 @@ index 63660814d0ba4090f52146119707f04d8b905f18..c340f7577435d59ae46455a2b94521bc
          try {
              for (;;) {
                  boolean moreTasks = this.tickMidTickTasks();
-@@ -2811,7 +2811,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2812,7 +2812,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  }
              }
          } finally {
diff --git a/patches/server/0289-Remove-Mojang-Profiler.patch b/patches/server/0289-Remove-Mojang-Profiler.patch
index b79071bca..021abca58 100644
--- a/patches/server/0289-Remove-Mojang-Profiler.patch
+++ b/patches/server/0289-Remove-Mojang-Profiler.patch
@@ -39,7 +39,7 @@ index edd378813873ed367784379b0f1666d1ccf2194d..eb4dac2239592d680ef31edf47f1ab66
  
          return b0;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c340f7577435d59ae46455a2b94521bc401aeaa9..24f767663b1190dcada3da554375e3a01064c462 100644
+index d1987cfa0b1bd60cb6d3145d9522216d72f253cc..d7c77908ba7f0a0c00c06744d1ee0c1ad3ee0d7c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -328,13 +328,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -165,10 +165,10 @@ index c340f7577435d59ae46455a2b94521bc401aeaa9..24f767663b1190dcada3da554375e3a0
          //MinecraftTimings.commandFunctionsTimer.stopTiming(); // Spigot // Paper // Purpur
 -        this.profiler.popPush("levels");
 +        //this.profiler.popPush("levels"); // Purpur
-         Iterator iterator = this.getAllLevels().iterator();
+         //Iterator iterator = this.getAllLevels().iterator(); // Paper - moved down
  
          // CraftBukkit start
-@@ -1564,18 +1564,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1565,18 +1565,18 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              worldserver.hasRidableMoveEvent = org.purpurmc.purpur.event.entity.RidableMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Purpur
              net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = worldserver.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper
  
@@ -192,7 +192,7 @@ index c340f7577435d59ae46455a2b94521bc401aeaa9..24f767663b1190dcada3da554375e3a0
  
              try {
                  //worldserver.timings.doTick.startTiming(); // Spigot // Purpur
-@@ -1601,17 +1601,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1602,17 +1602,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                  throw new ReportedException(crashreport);
              }
  
@@ -214,7 +214,7 @@ index c340f7577435d59ae46455a2b94521bc401aeaa9..24f767663b1190dcada3da554375e3a0
          //MinecraftTimings.playerListTimer.startTiming(); // Spigot // Paper // Purpur
          this.playerList.tick();
          //MinecraftTimings.playerListTimer.stopTiming(); // Spigot // Paper // Purpur
-@@ -1619,7 +1619,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1620,7 +1620,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              GameTestTicker.SINGLETON.tick();
          }
  
@@ -223,7 +223,7 @@ index c340f7577435d59ae46455a2b94521bc401aeaa9..24f767663b1190dcada3da554375e3a0
  
          //MinecraftTimings.tickablesTimer.startTiming(); // Spigot // Paper // Purpur
          for (int i = 0; i < this.tickables.size(); ++i) {
-@@ -1627,7 +1627,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1628,7 +1628,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
          //MinecraftTimings.tickablesTimer.stopTiming(); // Spigot // Paper // Purpur
  
@@ -232,7 +232,7 @@ index c340f7577435d59ae46455a2b94521bc401aeaa9..24f767663b1190dcada3da554375e3a0
      }
  
      public boolean isNetherEnabled() {
-@@ -2275,7 +2275,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2276,7 +2276,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public ProfilerFiller getProfiler() {
@@ -241,7 +241,7 @@ index c340f7577435d59ae46455a2b94521bc401aeaa9..24f767663b1190dcada3da554375e3a0
          return this.profiler;
      }
  
-@@ -2515,7 +2515,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2516,7 +2516,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      // CraftBukkit end
  
      private void startMetricsRecordingTick() {
@@ -250,7 +250,7 @@ index c340f7577435d59ae46455a2b94521bc401aeaa9..24f767663b1190dcada3da554375e3a0
              this.metricsRecorder = ActiveMetricsRecorder.createStarted(new ServerMetricsSamplersProvider(Util.timeSource, this.isDedicatedServer()), Util.timeSource, Util.ioPool(), new MetricsPersister("server"), this.onMetricsRecordingStopped, (path) -> {
                  this.executeBlocking(() -> {
                      this.saveDebugReport(path.resolve("server"));
-@@ -2525,40 +2525,40 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2526,40 +2526,40 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
              this.willStartRecordingMetrics = false;
          }
  
@@ -303,7 +303,7 @@ index c340f7577435d59ae46455a2b94521bc401aeaa9..24f767663b1190dcada3da554375e3a0
      }
  
      public Path getWorldPath(LevelResource worldSavePath) {
-@@ -2603,15 +2603,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2604,15 +2604,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public boolean isTimeProfilerRunning() {
@@ -802,7 +802,7 @@ index 207f07dfd0d2fd0ff5fdb3952966d069ca184123..6859e2054e8eb4fc8ac005e0bf646a30
  
                  while (iterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4d28a1f9fe43bb8e9f5ffaf06895c94fa0749d5d..08c46cdc626e89fed0d769d50735e983f2fb7f23 100644
+index 3b5b040cf3cdbb3798972f73b75e8ab4753987db..18068e33014936fd5471aad6b673c16982bd38fc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1153,7 +1153,7 @@ public class ServerPlayer extends Player {
@@ -825,7 +825,7 @@ index 4d28a1f9fe43bb8e9f5ffaf06895c94fa0749d5d..08c46cdc626e89fed0d769d50735e983
              if (true) { // CraftBukkit
                  this.isChangingDimension = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds
  
-@@ -1195,7 +1195,7 @@ public class ServerPlayer extends Player {
+@@ -1196,7 +1196,7 @@ public class ServerPlayer extends Player {
                  worldserver.addDuringPortalTeleport(this);
                  this.connection.teleport(exit); // CraftBukkit - use internal teleport without event
                  this.connection.resetPosition(); // CraftBukkit - sync position after changing it (from PortalTravelAgent#findAndteleport)
diff --git a/patches/server/0292-Debug-Marker-API.patch b/patches/server/0292-Debug-Marker-API.patch
index 5eea1c639..16881d98e 100644
--- a/patches/server/0292-Debug-Marker-API.patch
+++ b/patches/server/0292-Debug-Marker-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Debug Marker API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3806d4dbc846e75b3c4d1808b28f82eb638a3dce..d182eac78879b5e124bb62aded8a405b327275b4 100644
+index 0b1f803fb6e23e4bcd015aacc63be864c87dca6b..3fffeff2f7e12c021ac4d1e6754583f58a03f12f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1463,6 +1463,42 @@ public final class CraftServer implements Server {
+@@ -1468,6 +1468,42 @@ public final class CraftServer implements Server {
      public void removeFuel(org.bukkit.Material material) {
          net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity.removeFuel(net.minecraft.world.item.ItemStack.fromBukkitCopy(new ItemStack(material)));
      }