Fixup player profile getters and constructor to expected nullability (#9770)

38 files changed, 67 insertions, 61 deletions

diff --git a/patches/server/0141-Basic-PlayerProfile-API.patch b/patches/server/0141-Basic-PlayerProfile-API.patch
index 27e55afbdc..2dbf82216b 100644
--- a/patches/server/0141-Basic-PlayerProfile-API.patch
+++ b/patches/server/0141-Basic-PlayerProfile-API.patch
@@ -17,10 +17,10 @@ public org.bukkit.craftbukkit.profile.CraftPlayerProfile setProperty(Ljava/lang/
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..e513ce5bcb5070b8a57737228904381f1bda658e
+index 0000000000000000000000000000000000000000..b7da8606e24b216b39020130fd2c42c7cd387a3a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
-@@ -0,0 +1,401 @@
+@@ -0,0 +1,402 @@
 +package com.destroystokyo.paper.profile;
 +
 +import com.mojang.authlib.yggdrasil.ProfileResult;
@@ -59,7 +59,7 @@ index 0000000000000000000000000000000000000000..e513ce5bcb5070b8a57737228904381f
 +    }
 +
 +    public CraftPlayerProfile(UUID id, String name) {
-+        this.profile = new GameProfile(id, name);
++        this.profile = new GameProfile(id != null ? id : Util.NIL_UUID, name != null ? name : "");
 +    }
 +
 +    public CraftPlayerProfile(GameProfile profile) {
@@ -103,16 +103,17 @@ index 0000000000000000000000000000000000000000..e513ce5bcb5070b8a57737228904381f
 +    @Nullable
 +    @Override
 +    public UUID getId() {
-+        return profile.getId();
++        return profile.getId().equals(Util.NIL_UUID) ? null : profile.getId();
 +    }
 +
 +    @Override
 +    @Deprecated(forRemoval = true)
 +    public UUID setId(@Nullable UUID uuid) {
-+        GameProfile prev = this.profile;
-+        this.profile = new GameProfile(uuid, prev.getName());
-+        copyProfileProperties(prev, this.profile);
-+        return prev.getId();
++        final GameProfile previousProfile = this.profile;
++        final UUID previousId = this.getId();
++        this.profile = new GameProfile(previousProfile.getId(), previousProfile.getName());
++        copyProfileProperties(previousProfile, this.profile);
++        return previousId;
 +    }
 +
 +    @Override
@@ -130,7 +131,7 @@ index 0000000000000000000000000000000000000000..e513ce5bcb5070b8a57737228904381f
 +    @Deprecated(forRemoval = true)
 +    public String setName(@Nullable String name) {
 +        GameProfile prev = this.profile;
-+        this.profile = new GameProfile(prev.getId(), name);
++        this.profile = new GameProfile(prev.getId(), name != null ? name : "");
 +        copyProfileProperties(prev, this.profile);
 +        return prev.getName();
 +    }
@@ -213,7 +214,7 @@ index 0000000000000000000000000000000000000000..e513ce5bcb5070b8a57737228904381f
 +        MinecraftServer server = MinecraftServer.getServer();
 +        String name = profile.getName();
 +        GameProfileCache userCache = server.getProfileCache();
-+        if (profile.getId() == null) {
++        if (this.getId() == null) {
 +            final GameProfile profile;
 +            if (onlineMode) {
 +                profile = lookupUUID ? userCache.get(name).orElse(null) : userCache.getProfileIfCached(name);
@@ -228,11 +229,11 @@ index 0000000000000000000000000000000000000000..e513ce5bcb5070b8a57737228904381f
 +            }
 +        }
 +
-+        if ((profile.getName() == null || !hasTextures()) && profile.getId() != null) {
++        if ((profile.getName().isEmpty() || !hasTextures()) && this.getId() != null) {
 +            Optional<GameProfile> optProfile = userCache.get(this.profile.getId());
 +            if (optProfile.isPresent()) {
 +                GameProfile profile = optProfile.get();
-+                if (this.profile.getName() == null) {
++                if (this.profile.getName().isEmpty()) {
 +                    // if old has it, assume its newer, so overwrite, else use cached if it was set and ours wasn't
 +                    copyProfileProperties(this.profile, profile);
 +                    this.profile = profile;
@@ -314,7 +315,7 @@ index 0000000000000000000000000000000000000000..e513ce5bcb5070b8a57737228904381f
 +        if (this.getId() != null) {
 +            map.put("uniqueId", this.getId().toString());
 +        }
-+        if (this.getName() != null) {
++        if (!this.getName().isEmpty()) {
 +            map.put("name", getName());
 +        }
 +        if (!this.properties.isEmpty()) {
@@ -614,7 +615,7 @@ index c70cd016e1978931d115cfca94664897f0158196..eac9658fa4cab7a651e10e4e18c679e0
          String s1 = name.toLowerCase(Locale.ROOT);
          GameProfileCache.GameProfileInfo usercache_usercacheentry = (GameProfileCache.GameProfileInfo) this.profilesByName.get(s1);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0ef8750c7c862a44dfb0e15602ef819790c9f1a4..cfb0846381f5ebfe33fc4074f21fb0993812f75c 100644
+index 0ef8750c7c862a44dfb0e15602ef819790c9f1a4..a230e2ac2de48d4d5d963e1de2bd87999b4ad2fc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -263,6 +263,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -635,7 +636,7 @@ index 0ef8750c7c862a44dfb0e15602ef819790c9f1a4..cfb0846381f5ebfe33fc4074f21fb099
          CraftItemFactory.instance();
      }
  
-@@ -2681,5 +2685,37 @@ public final class CraftServer implements Server {
+@@ -2681,5 +2685,42 @@ public final class CraftServer implements Server {
      public boolean suggestPlayerNamesWhenNullTabCompletions() {
          return io.papermc.paper.configuration.GlobalConfiguration.get().commands.suggestPlayerNamesWhenNullTabCompletions;
      }
@@ -661,14 +662,19 @@ index 0ef8750c7c862a44dfb0e15602ef819790c9f1a4..cfb0846381f5ebfe33fc4074f21fb099
 +    @Override
 +    public com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name) {
 +        Player player = uuid != null ? Bukkit.getPlayer(uuid) : (name != null ? Bukkit.getPlayerExact(name) : null);
-+        if (player == null) return new com.destroystokyo.paper.profile.CraftPlayerProfile(uuid, name);
++        if (player == null) {
++            return new com.destroystokyo.paper.profile.CraftPlayerProfile(uuid, name);
++        }
 +
 +        if (java.util.Objects.equals(uuid, player.getUniqueId()) && java.util.Objects.equals(name, player.getName())) {
 +            return new com.destroystokyo.paper.profile.CraftPlayerProfile((CraftPlayer) player);
 +        }
 +
-+        final com.mojang.authlib.GameProfile profile = new com.mojang.authlib.GameProfile(uuid, name);
-+        profile.getProperties().putAll(((CraftPlayer)player).getHandle().getGameProfile().getProperties());
++        final com.mojang.authlib.GameProfile profile = new com.mojang.authlib.GameProfile(
++            uuid != null ? uuid : net.minecraft.Util.NIL_UUID,
++            name != null ? name : ""
++        );
++        profile.getProperties().putAll(((CraftPlayer) player).getHandle().getGameProfile().getProperties());
 +        return new com.destroystokyo.paper.profile.CraftPlayerProfile(profile);
 +    }
      // Paper end
diff --git a/patches/server/0167-AsyncTabCompleteEvent.patch b/patches/server/0167-AsyncTabCompleteEvent.patch
index 830efe8223..800e90a7e4 100644
--- a/patches/server/0167-AsyncTabCompleteEvent.patch
+++ b/patches/server/0167-AsyncTabCompleteEvent.patch
@@ -91,7 +91,7 @@ index 1b856ecd7926e90a62045176f75d7ae6f0ac69d5..4ba7ed0a4ff52caa21632f69ab087564
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cfb0846381f5ebfe33fc4074f21fb0993812f75c..1eb5f95848a25a0a002a3ec9e8edf03be63b140a 100644
+index a230e2ac2de48d4d5d963e1de2bd87999b4ad2fc..eb56b65b5f10fe00c3d44153e7c3bd6e6eef1071 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2131,7 +2131,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0183-getPlayerUniqueId-API.patch b/patches/server/0183-getPlayerUniqueId-API.patch
index 36cda224fb..23587be3eb 100644
--- a/patches/server/0183-getPlayerUniqueId-API.patch
+++ b/patches/server/0183-getPlayerUniqueId-API.patch
@@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1eb5f95848a25a0a002a3ec9e8edf03be63b140a..b0f76a563d640360b73cb1779eae74fbf552f54e 100644
+index eb56b65b5f10fe00c3d44153e7c3bd6e6eef1071..14a56b1153e87630065a58a6477573bef1597d12 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1729,6 +1729,25 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch
index 86c13487be..de1f773f4c 100644
--- a/patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/patches/server/0237-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -33,7 +33,7 @@ index 5a3f0a6e3f663718993cf3679ffc96c4af140e4d..cdc020e1787c258ba283d86a25ab1532
          com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics();
          com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b0f76a563d640360b73cb1779eae74fbf552f54e..c5a59f5f94ded049d39b1e1ffac1a71f4c5b9535 100644
+index 14a56b1153e87630065a58a6477573bef1597d12..37ce30dea4c46eeb301b986de5920c16d46990a1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -917,6 +917,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0282-Make-the-default-permission-message-configurable.patch b/patches/server/0282-Make-the-default-permission-message-configurable.patch
index 58965a428b..c3967fb621 100644
--- a/patches/server/0282-Make-the-default-permission-message-configurable.patch
+++ b/patches/server/0282-Make-the-default-permission-message-configurable.patch
@@ -18,7 +18,7 @@ index 0dd48e4098191c8b6e29945d62bc473e9f3a1e77..ae51993e0de706cb62c96795ca9de766
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c5a59f5f94ded049d39b1e1ffac1a71f4c5b9535..5fe9750472edaa5684ded6beb6acce3156bbc2b2 100644
+index 37ce30dea4c46eeb301b986de5920c16d46990a1..4758931f21a477b328ee463369338e22b22d4e1b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2707,6 +2707,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0315-Expose-the-internal-current-tick.patch b/patches/server/0315-Expose-the-internal-current-tick.patch
index c572e61619..0a6b328e7b 100644
--- a/patches/server/0315-Expose-the-internal-current-tick.patch
+++ b/patches/server/0315-Expose-the-internal-current-tick.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5fe9750472edaa5684ded6beb6acce3156bbc2b2..fc1dcd6aae389d89ab2c0233448ea64b50c065a9 100644
+index 4758931f21a477b328ee463369338e22b22d4e1b..dd4d1b6f59992c8bf0336b146cc163c6a612999d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2748,5 +2748,10 @@ public final class CraftServer implements Server {
-         profile.getProperties().putAll(((CraftPlayer)player).getHandle().getGameProfile().getProperties());
+@@ -2753,5 +2753,10 @@ public final class CraftServer implements Server {
+         profile.getProperties().putAll(((CraftPlayer) player).getHandle().getGameProfile().getProperties());
          return new com.destroystokyo.paper.profile.CraftPlayerProfile(profile);
      }
 +
diff --git a/patches/server/0342-Anti-Xray.patch b/patches/server/0342-Anti-Xray.patch
index 818476c21f..b89fbd92af 100644
--- a/patches/server/0342-Anti-Xray.patch
+++ b/patches/server/0342-Anti-Xray.patch
@@ -1554,7 +1554,7 @@ index d10dcf5b9c987bbd4761470c16c9d4693ccf896d..adee86c79f9db0a93691ec338791d7c7
  
      public CraftChunk(net.minecraft.world.level.chunk.LevelChunk chunk) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fc1dcd6aae389d89ab2c0233448ea64b50c065a9..5b097b8cef1a2b71e83be6f23abf088af20195ba 100644
+index dd4d1b6f59992c8bf0336b146cc163c6a612999d..be805e78fb4cb9fba25afd53af8d72ff4a1e1526 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2277,7 +2277,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0358-Add-tick-times-API-and-mspt-command.patch b/patches/server/0358-Add-tick-times-API-and-mspt-command.patch
index 45ee89b970..6a60a63b75 100644
--- a/patches/server/0358-Add-tick-times-API-and-mspt-command.patch
+++ b/patches/server/0358-Add-tick-times-API-and-mspt-command.patch
@@ -184,7 +184,7 @@ index 4d3cd4a5dbf7adb482e60dc88ededdaccf558061..951e283d38cb7601049ac6f24385acde
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5b097b8cef1a2b71e83be6f23abf088af20195ba..6c213d609972ac2fd9052057c07add57596d41b0 100644
+index be805e78fb4cb9fba25afd53af8d72ff4a1e1526..89d7ae645a0a34a260aa84464661b2ba47b9bc51 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2532,6 +2532,16 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0359-Expose-MinecraftServer-isRunning.patch b/patches/server/0359-Expose-MinecraftServer-isRunning.patch
index f85fdde8fd..5c522adc18 100644
--- a/patches/server/0359-Expose-MinecraftServer-isRunning.patch
+++ b/patches/server/0359-Expose-MinecraftServer-isRunning.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
 This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6c213d609972ac2fd9052057c07add57596d41b0..9a63b95ee80da386c1055976ffed8e032b67c903 100644
+index 89d7ae645a0a34a260aa84464661b2ba47b9bc51..ba381026071767428273b35cc57b4181c57c43f1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2763,5 +2763,10 @@ public final class CraftServer implements Server {
+@@ -2768,5 +2768,10 @@ public final class CraftServer implements Server {
      public int getCurrentTick() {
          return net.minecraft.server.MinecraftServer.currentTick;
      }
diff --git a/patches/server/0386-Expose-game-version.patch b/patches/server/0386-Expose-game-version.patch
index 1ae7f7b746..6e3879901b 100644
--- a/patches/server/0386-Expose-game-version.patch
+++ b/patches/server/0386-Expose-game-version.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose game version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9a63b95ee80da386c1055976ffed8e032b67c903..c4c0e55920f0e833f5a8c77ce199cbb271dd3313 100644
+index ba381026071767428273b35cc57b4181c57c43f1..4ebe72172b01dd48651ac6bf21026a77268fa6dc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -584,6 +584,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0389-misc-debugging-dumps.patch b/patches/server/0389-misc-debugging-dumps.patch
index 037edf800c..be3cf77b44 100644
--- a/patches/server/0389-misc-debugging-dumps.patch
+++ b/patches/server/0389-misc-debugging-dumps.patch
@@ -74,7 +74,7 @@ index ed80d9551cd7cc1ec26a5d5fd7bc185b38fddd78..77e19f345bf68d12686a65e669cd597c
              this.connection.disconnect(ServerConfigurationPacketListenerImpl.DISCONNECT_REASON_INVALID_DATA);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c4c0e55920f0e833f5a8c77ce199cbb271dd3313..633cd70f8390c4aa9a9b52054f8b58106ae079e6 100644
+index 4ebe72172b01dd48651ac6bf21026a77268fa6dc..98fec62469f19680cb849cffb6c00b603c34fb65 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1008,6 +1008,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0392-Implement-Mob-Goal-API.patch b/patches/server/0392-Implement-Mob-Goal-API.patch
index 01306798e0..17ae61d43b 100644
--- a/patches/server/0392-Implement-Mob-Goal-API.patch
+++ b/patches/server/0392-Implement-Mob-Goal-API.patch
@@ -792,10 +792,10 @@ index 4379b9948f1eecfe6fd7dea98e298ad5f761019a..3f081183521603824430709886a9cc31
          LOOK,
          JUMP,
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 633cd70f8390c4aa9a9b52054f8b58106ae079e6..83ff2373ba5ec4b862170e0c1ff2d84deb7df5eb 100644
+index 98fec62469f19680cb849cffb6c00b603c34fb65..70dfd93212fb0cb2c1e5e70e0d46e913be6a85e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2776,5 +2776,11 @@ public final class CraftServer implements Server {
+@@ -2781,5 +2781,11 @@ public final class CraftServer implements Server {
      public boolean isStopping() {
          return net.minecraft.server.MinecraftServer.getServer().hasStopped();
      }
diff --git a/patches/server/0399-Wait-for-Async-Tasks-during-shutdown.patch b/patches/server/0399-Wait-for-Async-Tasks-during-shutdown.patch
index c1fdfb149e..ee8a118236 100644
--- a/patches/server/0399-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/patches/server/0399-Wait-for-Async-Tasks-during-shutdown.patch
@@ -22,7 +22,7 @@ index a107751a13ccef2729068e9b9822509374d20187..e2b4e7fb68aeaa2a95f3d1dfdd045217
          // CraftBukkit end
          this.getConnection().stop();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 83ff2373ba5ec4b862170e0c1ff2d84deb7df5eb..ab4dc88090107b713051eb31d7dd425dd96cdc8e 100644
+index 70dfd93212fb0cb2c1e5e70e0d46e913be6a85e4..b35b3feafbd25d698d3fea463d4bf65b6a09b590 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1018,6 +1018,31 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0418-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/server/0418-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
index 9f6a79d59b..46a2774ba9 100644
--- a/patches/server/0418-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
+++ b/patches/server/0418-Fix-Per-World-Difficulty-Remembering-Difficulty.patch
@@ -102,7 +102,7 @@ index b664a4ae7b10ce3ea83186a6112c0db0cbd6112a..c3844274b185decd92d021e7c7343adb
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ab4dc88090107b713051eb31d7dd425dd96cdc8e..500f903b6ef6fa352b51696bd5be0a650ae6d2f1 100644
+index b35b3feafbd25d698d3fea463d4bf65b6a09b590..7494c8762f7ea9828a7dfc71dc2965838bbd8a0f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -957,8 +957,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0422-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/server/0422-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index 7424225e4b..a0a3f58f77 100644
--- a/patches/server/0422-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/patches/server/0422-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
@@ -22,7 +22,7 @@ wants it to collect even faster, they can restore that setting back to 1 instead
 Not adding it to .getType() though to keep behavior consistent with vanilla for performance reasons.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 500f903b6ef6fa352b51696bd5be0a650ae6d2f1..c0871d8a7ab38a881a03c5d1f18d8d8ca9e5b993 100644
+index 7494c8762f7ea9828a7dfc71dc2965838bbd8a0f..e58a2a3532d6ba62e99708b0f4f2cc8f3b6b97bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -384,7 +384,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0480-Add-getOfflinePlayerIfCached-String.patch b/patches/server/0480-Add-getOfflinePlayerIfCached-String.patch
index 88b45ac5e8..f63cf9350c 100644
--- a/patches/server/0480-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/server/0480-Add-getOfflinePlayerIfCached-String.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c0871d8a7ab38a881a03c5d1f18d8d8ca9e5b993..bf8c4dc4b9b9945087a0ab49e039a9808a39c696 100644
+index e58a2a3532d6ba62e99708b0f4f2cc8f3b6b97bc..877ce4baa6a0e755d81bdc3df57fcc9a0a90f1a5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1813,6 +1813,28 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0564-Expand-world-key-API.patch b/patches/server/0564-Expand-world-key-API.patch
index f255b7a5d0..91069f6e1a 100644
--- a/patches/server/0564-Expand-world-key-API.patch
+++ b/patches/server/0564-Expand-world-key-API.patch
@@ -20,7 +20,7 @@ index 93f44ca0c8388935baaa41f9b0ebb6de2f6906bb..53b62be779bbb31723c4953221d8b5f2
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bf8c4dc4b9b9945087a0ab49e039a9808a39c696..378be7b791a2d600c094ae39b1fb091fc6124557 100644
+index 877ce4baa6a0e755d81bdc3df57fcc9a0a90f1a5..48ba01082041281d247b898cfa84bccf21ce9b15 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1139,9 +1139,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0597-Add-basic-Datapack-API.patch b/patches/server/0597-Add-basic-Datapack-API.patch
index f2f796dfe6..c10a6a69e3 100644
--- a/patches/server/0597-Add-basic-Datapack-API.patch
+++ b/patches/server/0597-Add-basic-Datapack-API.patch
@@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 378be7b791a2d600c094ae39b1fb091fc6124557..44011ea91590e26fb39ee149eac06811ea47eb02 100644
+index 48ba01082041281d247b898cfa84bccf21ce9b15..87374f4f81affc7ae72d7178f4c414026518a5f6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -303,6 +303,7 @@ public final class CraftServer implements Server {
@@ -111,7 +111,7 @@ index 378be7b791a2d600c094ae39b1fb091fc6124557..44011ea91590e26fb39ee149eac06811
      }
  
      public boolean getCommandBlockOverride(String command) {
-@@ -2844,5 +2846,11 @@ public final class CraftServer implements Server {
+@@ -2849,5 +2851,11 @@ public final class CraftServer implements Server {
      public com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
          return mobGoals;
      }
diff --git a/patches/server/0603-Fix-and-optimise-world-force-upgrading.patch b/patches/server/0603-Fix-and-optimise-world-force-upgrading.patch
index c2f07910f7..f76a27b6fd 100644
--- a/patches/server/0603-Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/0603-Fix-and-optimise-world-force-upgrading.patch
@@ -360,7 +360,7 @@ index b850dba2b0fa5bc762b170ed7083cf8904761f17..7dee0f7d49f3492c92fceff7750e6962
          return this.regionCache.getAndMoveToFirst(ChunkPos.asLong(chunkcoordintpair.getRegionX(), chunkcoordintpair.getRegionZ()));
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 44011ea91590e26fb39ee149eac06811ea47eb02..a5b77644dc64e646de0d542dfd7b7f68df823eb1 100644
+index 87374f4f81affc7ae72d7178f4c414026518a5f6..ab1c96a6d7e0d3f8bb651936256e9a66badf3355 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1216,9 +1216,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0641-Add-System.out-err-catcher.patch b/patches/server/0641-Add-System.out-err-catcher.patch
index 8fdf8da1bf..1f11b3d41a 100644
--- a/patches/server/0641-Add-System.out-err-catcher.patch
+++ b/patches/server/0641-Add-System.out-err-catcher.patch
@@ -105,7 +105,7 @@ index 0000000000000000000000000000000000000000..a8e813ca89b033f061e695288b3383bd
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a5b77644dc64e646de0d542dfd7b7f68df823eb1..8d174306f50f40235754773ee8299115eb0d8917 100644
+index ab1c96a6d7e0d3f8bb651936256e9a66badf3355..2a5daa15b1095b20716e997c18fe68ac7d550da6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -305,6 +305,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0676-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0676-Add-paper-mobcaps-and-paper-playermobcaps.patch
index 53b9568498..402fa3cdec 100644
--- a/patches/server/0676-Add-paper-mobcaps-and-paper-playermobcaps.patch
+++ b/patches/server/0676-Add-paper-mobcaps-and-paper-playermobcaps.patch
@@ -278,7 +278,7 @@ index 9df761f5cf043e8d2dffa711c20ab32fe2992331..d08c7b0b52065980f1f13c5533ff6355
          // Paper start - add parameters and int ret type
          spawnCategoryForChunk(group, world, chunk, checker, runner, Integer.MAX_VALUE, null);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8d174306f50f40235754773ee8299115eb0d8917..9d1a5979b59bbd1efe03d39b12fc726836637614 100644
+index 2a5daa15b1095b20716e997c18fe68ac7d550da6..58e9e04d05d23471690e0d9e42aeb98a64d8dabf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2183,6 +2183,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0726-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0726-Allow-delegation-to-vanilla-chunk-gen.patch
index 78cf9a0a13..5ac222f51b 100644
--- a/patches/server/0726-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/server/0726-Allow-delegation-to-vanilla-chunk-gen.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9d1a5979b59bbd1efe03d39b12fc726836637614..c5635cec189653b6a5559e99f48ca9149925e338 100644
+index 58e9e04d05d23471690e0d9e42aeb98a64d8dabf..c103ac154104a1e50ed687a2154a1e0e579b786a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2363,6 +2363,88 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0746-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0746-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 952a08efa8..737d3aa5ca 100644
--- a/patches/server/0746-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/server/0746-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
@@ -18,7 +18,7 @@ index 6c02d5233c782b0e5049afdf84250687ae71dcde..2503e2b2436a6e07fa22c0e55ad1539b
                  biomeProvider = gen.getDefaultBiomeProvider(worldInfo);
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c5635cec189653b6a5559e99f48ca9149925e338..1ebdf0d7f45ecaa996c96a9b0c34e44b3386ff16 100644
+index c103ac154104a1e50ed687a2154a1e0e579b786a..73738d920a7a5776165eb3586ddf0676ffa64886 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1223,7 +1223,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0761-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0761-API-for-creating-command-sender-which-forwards-feedb.patch
index bf13487de2..52d5e8d920 100644
--- a/patches/server/0761-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/server/0761-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -122,7 +122,7 @@ index 0000000000000000000000000000000000000000..e3a5f1ec376319bdfda87fa27ae217bf
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1ebdf0d7f45ecaa996c96a9b0c34e44b3386ff16..c9d8126334d3854fdfb49e405cbcf20c46a5cef5 100644
+index 73738d920a7a5776165eb3586ddf0676ffa64886..801479941333e421427b22edd2c129b8ab095b38 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2014,6 +2014,13 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0765-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0765-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
index 5dfaf5801c..81e125c23b 100644
--- a/patches/server/0765-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
+++ b/patches/server/0765-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing Validate calls to CraftServer#getSpawnLimit
 Copies appropriate checks from CraftWorld#getSpawnLimit
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c9d8126334d3854fdfb49e405cbcf20c46a5cef5..d221bba043586ecec6923d57aebe4316c7bfbb83 100644
+index 801479941333e421427b22edd2c129b8ab095b38..6fa952f517759e11728450d73b169b2d06b2c35e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2191,6 +2191,8 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0766-Add-GameEvent-tags.patch b/patches/server/0766-Add-GameEvent-tags.patch
index 2a116e8b6a..a749cd2f78 100644
--- a/patches/server/0766-Add-GameEvent-tags.patch
+++ b/patches/server/0766-Add-GameEvent-tags.patch
@@ -46,7 +46,7 @@ index 0000000000000000000000000000000000000000..e7d9fd2702a1ce96596580fff8f5ee4f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d221bba043586ecec6923d57aebe4316c7bfbb83..1322b3b2a10a9580ed03fe4160757717eb1bc20f 100644
+index 6fa952f517759e11728450d73b169b2d06b2c35e..3ca63ce5bb1d16db02c8f924431a7911f8682937 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2612,6 +2612,15 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0772-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0772-Put-world-into-worldlist-before-initing-the-world.patch
index 3b210b76bc..10434a48f9 100644
--- a/patches/server/0772-Put-world-into-worldlist-before-initing-the-world.patch
+++ b/patches/server/0772-Put-world-into-worldlist-before-initing-the-world.patch
@@ -23,7 +23,7 @@ index 7d944606f7e136aa60a0ea376ef325887bd4e6a8..e7bd891260ad4c95c6161542e6d1412c
  
              if (worlddata.getCustomBossEvents() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1322b3b2a10a9580ed03fe4160757717eb1bc20f..91e6f315aa9044ee3df93f4b38f521ff0ddfe23f 100644
+index 3ca63ce5bb1d16db02c8f924431a7911f8682937..ea08e06eb17ae67cc0eb65b4e3900705cb7e4300 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1252,10 +1252,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0774-Custom-Potion-Mixes.patch b/patches/server/0774-Custom-Potion-Mixes.patch
index 88e7065159..f6e9b74b90 100644
--- a/patches/server/0774-Custom-Potion-Mixes.patch
+++ b/patches/server/0774-Custom-Potion-Mixes.patch
@@ -164,7 +164,7 @@ index 424406d2692856cfd82b6f3b7b6228fa3bd20c2f..c57efcb9a79337ec791e4e8f6671612f
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 91e6f315aa9044ee3df93f4b38f521ff0ddfe23f..d79e96c2950ed1976affa7cda7f0571010d4dc75 100644
+index ea08e06eb17ae67cc0eb65b4e3900705cb7e4300..1a958746f7a9992b1fe6c7ea07d044ad98dcb26d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -306,6 +306,7 @@ public final class CraftServer implements Server {
@@ -184,7 +184,7 @@ index 91e6f315aa9044ee3df93f4b38f521ff0ddfe23f..d79e96c2950ed1976affa7cda7f05710
          MobEffects.BLINDNESS.getClass();
          PotionEffectType.stopAcceptingRegistrations();
          // Ugly hack :(
-@@ -2971,5 +2972,10 @@ public final class CraftServer implements Server {
+@@ -2976,5 +2977,10 @@ public final class CraftServer implements Server {
          return datapackManager;
      }
  
diff --git a/patches/server/0785-Fix-saving-in-unloadWorld.patch b/patches/server/0785-Fix-saving-in-unloadWorld.patch
index cc92085e95..39fff596cf 100644
--- a/patches/server/0785-Fix-saving-in-unloadWorld.patch
+++ b/patches/server/0785-Fix-saving-in-unloadWorld.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix saving in unloadWorld
 Change savingDisabled to false to ensure ServerLevel's saving logic gets called when unloadWorld is called with save = true
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d79e96c2950ed1976affa7cda7f0571010d4dc75..f624df3d9b08abfe43a38ca41c452ccbb8ffc76c 100644
+index 1a958746f7a9992b1fe6c7ea07d044ad98dcb26d..0efe5a68095b1ae1cdc3c566179c6f885217e79a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1300,7 +1300,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0801-WorldCreator-keepSpawnLoaded.patch b/patches/server/0801-WorldCreator-keepSpawnLoaded.patch
index 37b243e28a..f83645a792 100644
--- a/patches/server/0801-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/server/0801-WorldCreator-keepSpawnLoaded.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] WorldCreator#keepSpawnLoaded
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f624df3d9b08abfe43a38ca41c452ccbb8ffc76c..93cc7a4246b4c6b1449ff6a165f87bfaa63192c0 100644
+index 0efe5a68095b1ae1cdc3c566179c6f885217e79a..a62bacbda6e3698403d41365db22f6a7140f1c0c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1259,6 +1259,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0817-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0817-Throw-exception-on-world-create-while-being-ticked.patch
index a6e3a9e189..8dac496b99 100644
--- a/patches/server/0817-Throw-exception-on-world-create-while-being-ticked.patch
+++ b/patches/server/0817-Throw-exception-on-world-create-while-being-ticked.patch
@@ -45,7 +45,7 @@ index a197fa2864382363860b4a3db8160ed64f928df7..dd05048c5c9c37002708f0eee4e4fa0f
          this.profiler.popPush("connection");
          MinecraftTimings.connectionTimer.startTiming(); // Spigot
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 93cc7a4246b4c6b1449ff6a165f87bfaa63192c0..bd532e3ba13471ed6f5193d6e05740f405283809 100644
+index a62bacbda6e3698403d41365db22f6a7140f1c0c..3ccd26eb31aab876dc3a2da2f3c3baa95afd7200 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -876,6 +876,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0824-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0824-Don-t-broadcast-messages-to-command-blocks.patch
index fc3f56a006..df5e4f235b 100644
--- a/patches/server/0824-Don-t-broadcast-messages-to-command-blocks.patch
+++ b/patches/server/0824-Don-t-broadcast-messages-to-command-blocks.patch
@@ -20,7 +20,7 @@ index e05eb08a9c229b371887676da510df948b896a85..ceeedbd88c56c08ec8b047c9ca2f14cc
              Date date = new Date();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bd532e3ba13471ed6f5193d6e05740f405283809..2260c2144c956e77eab83f7fdbf1e8ba85d1d941 100644
+index 3ccd26eb31aab876dc3a2da2f3c3baa95afd7200..7441b15d074de921d3dc0f594e491d036b1f6064 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1776,7 +1776,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0843-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0843-Add-Velocity-IP-Forwarding-Support.patch
index 05f3adaa19..2795895eb5 100644
--- a/patches/server/0843-Add-Velocity-IP-Forwarding-Support.patch
+++ b/patches/server/0843-Add-Velocity-IP-Forwarding-Support.patch
@@ -215,7 +215,7 @@ index f7ad9f51d4fb45d41c718a97c1fad72504d0c0ad..78810048fde7fd6299cdc99634ba6467
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2260c2144c956e77eab83f7fdbf1e8ba85d1d941..332344f220335ab309079a022a0b590339f34560 100644
+index 7441b15d074de921d3dc0f594e491d036b1f6064..34bde8263dd0f3eeae81d896e2d328d276353e7a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -805,7 +805,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0951-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0951-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
index fed6106483..2c692b14f6 100644
--- a/patches/server/0951-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
+++ b/patches/server/0951-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't enforce icanhasbukkit default if alias block exists
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 332344f220335ab309079a022a0b590339f34560..f8465d3e8fd2ad877d8f5614a815d6e528cc4fa0 100644
+index 34bde8263dd0f3eeae81d896e2d328d276353e7a..b159ada5e593ee4e8e0059eb5cb554c723231e88 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -359,7 +359,11 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0978-Folia-scheduler-and-owned-region-API.patch b/patches/server/0978-Folia-scheduler-and-owned-region-API.patch
index fce6634bda..b0c5c0f815 100644
--- a/patches/server/0978-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/server/0978-Folia-scheduler-and-owned-region-API.patch
@@ -1224,7 +1224,7 @@ index ac7f1f317782a6c6ad41614fbe6c25498da63010..426023af3cbed9c17048e669c87a1c66
      public void setLevelCallback(EntityInLevelCallback changeListener) {
          this.levelCallback = changeListener;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f8465d3e8fd2ad877d8f5614a815d6e528cc4fa0..f1ae1718e8ccfe7098740a2f3ec038bd9bff063d 100644
+index b159ada5e593ee4e8e0059eb5cb554c723231e88..edbdfb66c629a5dc01db01d1164c22b4c6df6d00 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -308,6 +308,76 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0980-API-for-updating-recipes-on-clients.patch b/patches/server/0980-API-for-updating-recipes-on-clients.patch
index 8613c17c1a..955dacadd6 100644
--- a/patches/server/0980-API-for-updating-recipes-on-clients.patch
+++ b/patches/server/0980-API-for-updating-recipes-on-clients.patch
@@ -39,7 +39,7 @@ index 2fcca41018e6432211606276ea33170ff4f86529..c2d50d5b070e2e916cd9cb370d2d8ce0
          Iterator iterator1 = this.players.iterator();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f1ae1718e8ccfe7098740a2f3ec038bd9bff063d..b5965be96f09a6cac86b494a98a7193334c5888e 100644
+index edbdfb66c629a5dc01db01d1164c22b4c6df6d00..243050b941b5e71796f6cf72ec831b4b6105c505 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1131,6 +1131,18 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0985-Use-correct-seed-on-api-world-load.patch b/patches/server/0985-Use-correct-seed-on-api-world-load.patch
index fecdbb79e7..83354b23f6 100644
--- a/patches/server/0985-Use-correct-seed-on-api-world-load.patch
+++ b/patches/server/0985-Use-correct-seed-on-api-world-load.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use correct seed on api world load
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b5965be96f09a6cac86b494a98a7193334c5888e..c5c15e7aeadbd084c7ab3f1ace6b7305f739a75b 100644
+index 243050b941b5e71796f6cf72ec831b4b6105c505..c40fbae05a174efc98ed721c7049e1d41d1bd3b8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1312,7 +1312,7 @@ public final class CraftServer implements Server {
diff --git a/patches/server/0993-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0993-Deprecate-and-replace-methods-with-old-StructureType.patch
index ee2a07e0d9..8a3281356b 100644
--- a/patches/server/0993-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/server/0993-Deprecate-and-replace-methods-with-old-StructureType.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate and replace methods with old StructureType
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c5c15e7aeadbd084c7ab3f1ace6b7305f739a75b..fcd5096d64edfaf6bce3ecce8c9b9afb84462786 100644
+index c40fbae05a174efc98ed721c7049e1d41d1bd3b8..b7e7e6ed60f55d2ab5e4fcefb3638ad1768c3b7f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1854,6 +1854,11 @@ public final class CraftServer implements Server {