[Auto] Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
d75d8a38 #549: Add Fluid types / tags

CraftBukkit Changes:
890130b46 #746: Add Fluid types / tags

Spigot-Server-Patches/0002-Paper-config-files.patch

@@ -654,10 +654,10 @@ index 62134fdbdbdc044001940d069622ccce9bdfbee2..3150f4a0a8f1f8256c7e296f479b632b
          this.world = new CraftWorld((WorldServer) this, gen, env);
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 12b53e204f178f4155fc9a32523708fbdfb69e95..e47ebe8093fe059a7ccec0161bbe0ec9bb0ac3bc 100644
+index 0986d666b777b9992f8cbbffef964717cabe91df..159c0c671833a8973b543fd83d8b6b3394b35dc0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -802,6 +802,7 @@ public final class CraftServer implements Server {
+@@ -804,6 +804,7 @@ public final class CraftServer implements Server {
          }
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
@@ -665,7 +665,7 @@ index 12b53e204f178f4155fc9a32523708fbdfb69e95..e47ebe8093fe059a7ccec0161bbe0ec9
          for (WorldServer world : console.getWorlds()) {
              world.worldDataServer.setDifficulty(config.difficulty);
              world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
-@@ -835,6 +836,7 @@ public final class CraftServer implements Server {
+@@ -837,6 +838,7 @@ public final class CraftServer implements Server {
                  world.ticksPerAmbientSpawns = this.getTicksPerAmbientSpawns();
              }
              world.spigotConfig.init(); // Spigot
@@ -673,7 +673,7 @@ index 12b53e204f178f4155fc9a32523708fbdfb69e95..e47ebe8093fe059a7ccec0161bbe0ec9
          }
  
          pluginManager.clearPlugins();
-@@ -842,6 +844,7 @@ public final class CraftServer implements Server {
+@@ -844,6 +846,7 @@ public final class CraftServer implements Server {
          resetRecipes();
          reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
@@ -681,7 +681,7 @@ index 12b53e204f178f4155fc9a32523708fbdfb69e95..e47ebe8093fe059a7ccec0161bbe0ec9
          overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
          ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2080,4 +2083,35 @@ public final class CraftServer implements Server {
+@@ -2091,4 +2094,35 @@ public final class CraftServer implements Server {
      {
          return spigot;
      }

Spigot-Server-Patches/0009-Timings-v2.patch

@@ -1807,10 +1807,10 @@ index 4947a0aaab2dd91f3184365e64c4ad4e05132283..a807933d65a22dc1b15eda4dee819af7
  
          // CraftBukkit start - moved from MinecraftServer.saveChunks
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e47ebe8093fe059a7ccec0161bbe0ec9bb0ac3bc..374c1c82ed26fe0fb3519f4339708bc1e8386be9 100644
+index 159c0c671833a8973b543fd83d8b6b3394b35dc0..90551257c299aaf694eb4f4063d5b1b3eee94876 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2053,12 +2053,31 @@ public final class CraftServer implements Server {
+@@ -2064,12 +2064,31 @@ public final class CraftServer implements Server {
      private final Spigot spigot = new Spigot()
      {
  
@@ -2204,10 +2204,10 @@ index e52ef47b783785dc214746b678e7b549aea9a274..3d90b3426873a3528af14f7f1ab0adae
          this.value = value;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 4d8cd8234a65fc00badc2351e32210bd1a901f2f..931bdc2da33479991f4024c4f1a7dcc39f5d54d9 100644
+index 983444d7b742c1f7c5f08f26808dd484f90d6c20..bfecee2c9e4c68d5e254b445b3100247322017fc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -138,6 +138,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -158,6 +158,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
          return CraftNamespacedKey.toMinecraft(mat.getKey());
      }
      // ========================================================================
@@ -2220,7 +2220,7 @@ index 4d8cd8234a65fc00badc2351e32210bd1a901f2f..931bdc2da33479991f4024c4f1a7dcc3
  
      public static byte toLegacyData(IBlockData data) {
          return CraftLegacy.toLegacyData(data);
-@@ -312,6 +318,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -332,6 +338,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
          return clazz;
      }
  

Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch

@@ -32,10 +32,10 @@ index 033633139b50f1d991ee6b18b8fb750225b52f34..f2b3df4319a3b0348bc5185d841abf7c
  
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 374c1c82ed26fe0fb3519f4339708bc1e8386be9..36f9daddc3d4dc33f8eccb73e55a979ce73b6d05 100644
+index 90551257c299aaf694eb4f4063d5b1b3eee94876..ac177cd391e220af7584463e35f1f11e0393cde8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -225,7 +225,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
+@@ -227,7 +227,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
  import net.md_5.bungee.api.chat.BaseComponent; // Spigot
  
  public final class CraftServer implements Server {

Spigot-Server-Patches/0018-Implement-Paper-VersionChecker.patch

@@ -126,10 +126,10 @@ index 0000000000000000000000000000000000000000..5deed3e25ff41ab0a4015a5fd0c1e952
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 931bdc2da33479991f4024c4f1a7dcc39f5d54d9..b4f61448889255168a39aa2de5d66d8253e68963 100644
+index bfecee2c9e4c68d5e254b445b3100247322017fc..185a0600e655f0ae85d22c438e9beb398cb12896 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -323,6 +323,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -343,6 +343,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
      public String getTimingsServerName() {
          return com.destroystokyo.paper.PaperConfig.timingsServerName;
      }

Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch

@@ -140,10 +140,10 @@ index f2b3df4319a3b0348bc5185d841abf7c0e21d425..74760e36b4e14ae6bd6e65324e5282f6
                      GameProfilerTick gameprofilertick = GameProfilerTick.a("Server");
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 36f9daddc3d4dc33f8eccb73e55a979ce73b6d05..5b60b46316a64a99cbc0707ca1052644957d86f8 100644
+index ac177cd391e220af7584463e35f1f11e0393cde8..d815d1078249f5c849d501835b2d747c52f20af6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2050,6 +2050,17 @@ public final class CraftServer implements Server {
+@@ -2061,6 +2061,17 @@ public final class CraftServer implements Server {
          return CraftMagicNumbers.INSTANCE;
      }
  

Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch

@@ -48,10 +48,10 @@ index fd1860e3a83dec60362997ac6e1225270260cf38..7493d7ce48a9c5875bce01252b4d958a
          } else if (this.player.getChatFlags() == EnumChatVisibility.SYSTEM) {
              // Do nothing, this is coming from a plugin
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5b60b46316a64a99cbc0707ca1052644957d86f8..1515e2a0cfacd31cd9d848acd785bb5ece26fb30 100644
+index d815d1078249f5c849d501835b2d747c52f20af6..b653e94497c2c3da0b1ba343acb56039b95b89b4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -753,6 +753,29 @@ public final class CraftServer implements Server {
+@@ -755,6 +755,29 @@ public final class CraftServer implements Server {
          Validate.notNull(commandLine, "CommandLine cannot be null");
          org.spigotmc.AsyncCatcher.catchOp("command dispatch"); // Spigot
  

Spigot-Server-Patches/0046-Expose-server-CommandMap.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1515e2a0cfacd31cd9d848acd785bb5ece26fb30..653994ae4d73542b3f3bd0f24dded8a6a4269546 100644
+index b653e94497c2c3da0b1ba343acb56039b95b89b4..b5e1ae8efb7165547e228d2c9d6d84a72b772df5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1704,6 +1704,7 @@ public final class CraftServer implements Server {
+@@ -1706,6 +1706,7 @@ public final class CraftServer implements Server {
          return helpMap;
      }
  

Spigot-Server-Patches/0052-Add-velocity-warnings.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 653994ae4d73542b3f3bd0f24dded8a6a4269546..dc02cec7a613b91eb69fc9d0b219e5830001b248 100644
+index b5e1ae8efb7165547e228d2c9d6d84a72b772df5..fb18d519961f5130e7b6907d24305b35622bb63c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -261,6 +261,7 @@ public final class CraftServer implements Server {
+@@ -263,6 +263,7 @@ public final class CraftServer implements Server {
      public boolean ignoreVanillaPermissions = false;
      private final List<CraftPlayer> playerView;
      public int reloadCount;

Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch

@@ -30,10 +30,10 @@ index a62f4bbb973b9cb6d1ee53f56a0897d70ae176af..f207abbe757ad403a29a7a012903aaa8
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index dc02cec7a613b91eb69fc9d0b219e5830001b248..3ddf05bc75d2ac222ecc0f118ca7c7173bca6b0d 100644
+index fb18d519961f5130e7b6907d24305b35622bb63c..c59e2a2cdc1accd8d7fb119bee954eb68380e4f7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -398,6 +398,7 @@ public final class CraftServer implements Server {
+@@ -400,6 +400,7 @@ public final class CraftServer implements Server {
          if (type == PluginLoadOrder.STARTUP) {
              helpMap.clear();
              helpMap.initializeGeneralTopics();
@@ -41,7 +41,7 @@ index dc02cec7a613b91eb69fc9d0b219e5830001b248..3ddf05bc75d2ac222ecc0f118ca7c717
          }
  
          Plugin[] plugins = pluginManager.getPlugins();
-@@ -417,7 +418,7 @@ public final class CraftServer implements Server {
+@@ -419,7 +420,7 @@ public final class CraftServer implements Server {
              commandMap.registerServerAliases();
              DefaultPermissions.registerCorePermissions();
              CraftDefaultPermissions.registerCorePermissions();

Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
 https://github.com/PaperMC/Paper/issues/49
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3ddf05bc75d2ac222ecc0f118ca7c7173bca6b0d..29d6b2684bd5ae7056fdcd70efcc517eb03acfff 100644
+index c59e2a2cdc1accd8d7fb119bee954eb68380e4f7..0ecda8be9781d98253a5b9a97e7d76be118866c4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2169,5 +2169,23 @@ public final class CraftServer implements Server {
+@@ -2180,5 +2180,23 @@ public final class CraftServer implements Server {
              return null;
          }
      }

Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch

@@ -7,10 +7,10 @@ Metadata is not meant to persist reload as things break badly with non primitive
 This will remove metadata on reload so it does not crash everything if a plugin uses it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 29d6b2684bd5ae7056fdcd70efcc517eb03acfff..aaf98c09a9cb7c8a604719944b7623e9a298858f 100644
+index 0ecda8be9781d98253a5b9a97e7d76be118866c4..2acea7f374d21a906abce274816ad8d7cc9b9a34 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -864,8 +864,18 @@ public final class CraftServer implements Server {
+@@ -866,8 +866,18 @@ public final class CraftServer implements Server {
              world.paperConfig.init(); // Paper
          }
  

Spigot-Server-Patches/0108-Add-setting-for-proxy-online-mode-status.patch

@@ -45,10 +45,10 @@ index 060887d765604e4be82913607bb6266a278f5db6..c5957c2d6c54b076ebe7f9a432e30551
          } else {
              String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index aaf98c09a9cb7c8a604719944b7623e9a298858f..e26299119f7c541a819b14fced45857119ffb072 100644
+index 2acea7f374d21a906abce274816ad8d7cc9b9a34..c3c21623c8168f5e929cd31e66116232d3e0f0c1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1482,7 +1482,8 @@ public final class CraftServer implements Server {
+@@ -1484,7 +1484,8 @@ public final class CraftServer implements Server {
              // Spigot Start
              GameProfile profile = null;
              // Only fetch an online UUID in online mode

Spigot-Server-Patches/0120-Allow-Reloading-of-Command-Aliases.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e26299119f7c541a819b14fced45857119ffb072..96baf6edd6563e30ff2f34ddcfeeecdfadd0e5b9 100644
+index c3c21623c8168f5e929cd31e66116232d3e0f0c1..bf86a4cd46db0961d4dbe19be0a799dabf6212a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2198,5 +2198,24 @@ public final class CraftServer implements Server {
+@@ -2209,5 +2209,24 @@ public final class CraftServer implements Server {
          DefaultPermissions.registerCorePermissions();
          CraftDefaultPermissions.registerCorePermissions();
      }

Spigot-Server-Patches/0145-Add-configuration-option-to-prevent-player-names-fro.patch

@@ -20,10 +20,10 @@ index c4086de778cc2ccc958b1a94dd6e9cdb5065076c..5fa63d7ca20b88a44d8800b3ebf74e4c
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 96baf6edd6563e30ff2f34ddcfeeecdfadd0e5b9..d2406e68c7cb9ce04143602cbf64f097bfa6550d 100644
+index bf86a4cd46db0961d4dbe19be0a799dabf6212a2..b54d24096bba7afd33b45cf22dfcdafcfa31eb3d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2217,5 +2217,10 @@ public final class CraftServer implements Server {
+@@ -2228,5 +2228,10 @@ public final class CraftServer implements Server {
          commandMap.registerServerAliases();
          return true;
      }

Spigot-Server-Patches/0146-Use-TerminalConsoleAppender-for-console-improvements.patch

@@ -144,7 +144,7 @@ index 0000000000000000000000000000000000000000..685deaa0e5d1ddc13e3a7c0471b1cfcf
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 2d74d14385c7e705cb210bcfc0780f4c9c6a1cda..4b5da3bf52dc55b7da3109da42c190d4e0d55e36 100644
+index 971be962f5031dc6bb5f6cbb7bb7667896f4a50e..3bdde27a52c88b5f0621bdaf30ccd1ac00160b64 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -60,6 +60,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -259,7 +259,7 @@ index ab3c18b6d29397d1a7faff376043f6c3fe402f5d..fb14381b5bfca33431879c8b6a8b559c
  
          this.k = new GameProfileBanList(PlayerList.b);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d2406e68c7cb9ce04143602cbf64f097bfa6550d..3e7048365d04b0ac17a70e964950abd9597ce37e 100644
+index b54d24096bba7afd33b45cf22dfcdafcfa31eb3d..2eb2c0c93b0d67ad7474e37158dab44018c9cbac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -46,7 +46,7 @@ import java.util.function.Consumer;
@@ -271,7 +271,7 @@ index d2406e68c7cb9ce04143602cbf64f097bfa6550d..3e7048365d04b0ac17a70e964950abd9
  import net.minecraft.server.Advancement;
  import net.minecraft.server.ArgumentEntity;
  import net.minecraft.server.BiomeManager;
-@@ -1192,9 +1192,13 @@ public final class CraftServer implements Server {
+@@ -1194,9 +1194,13 @@ public final class CraftServer implements Server {
          return logger;
      }
  

Spigot-Server-Patches/0151-Add-UnknownCommandEvent.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add UnknownCommandEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3e7048365d04b0ac17a70e964950abd9597ce37e..474bbbbd2adca0e504d351b581f4cb544a8d41e3 100644
+index 2eb2c0c93b0d67ad7474e37158dab44018c9cbac..3e3f2a3d3b5ab32f498b4dd65f35f4c26470790f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -104,6 +104,7 @@ import net.minecraft.server.WorldNBTStorage;
+@@ -105,6 +105,7 @@ import net.minecraft.server.WorldNBTStorage;
  import net.minecraft.server.WorldServer;
  import net.minecraft.server.WorldSettings;
  import org.apache.commons.lang.Validate;
@@ -16,7 +16,7 @@ index 3e7048365d04b0ac17a70e964950abd9597ce37e..474bbbbd2adca0e504d351b581f4cb54
  import org.bukkit.BanList;
  import org.bukkit.Bukkit;
  import org.bukkit.ChatColor;
-@@ -176,6 +177,7 @@ import org.bukkit.craftbukkit.util.Versioning;
+@@ -178,6 +179,7 @@ import org.bukkit.craftbukkit.util.Versioning;
  import org.bukkit.craftbukkit.util.permissions.CraftDefaultPermissions;
  import org.bukkit.entity.Entity;
  import org.bukkit.entity.Player;
@@ -24,7 +24,7 @@ index 3e7048365d04b0ac17a70e964950abd9597ce37e..474bbbbd2adca0e504d351b581f4cb54
  import org.bukkit.event.inventory.InventoryType;
  import org.bukkit.event.player.PlayerChatTabCompleteEvent;
  import org.bukkit.event.server.BroadcastMessageEvent;
-@@ -784,7 +786,13 @@ public final class CraftServer implements Server {
+@@ -786,7 +788,13 @@ public final class CraftServer implements Server {
  
          // Spigot start
          if (!org.spigotmc.SpigotConfig.unknownCommandMessage.isEmpty()) {

Spigot-Server-Patches/0152-Basic-PlayerProfile-API.patch

@@ -508,10 +508,10 @@ index 7171bdf7fb0489e9678588dfa33410984015ea3f..2484293b12d9ec88b8a2570aa853a12f
          private volatile long c;
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 474bbbbd2adca0e504d351b581f4cb544a8d41e3..6f9efe4e5d286fc73a1ecf82e39865715ff03a33 100644
+index 3e3f2a3d3b5ab32f498b4dd65f35f4c26470790f..6137bb510eec7d8c2ff2908b1255e56d1e2a39ef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -226,6 +226,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
+@@ -228,6 +228,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
  
  import net.md_5.bungee.api.chat.BaseComponent; // Spigot
  
@@ -521,7 +521,7 @@ index 474bbbbd2adca0e504d351b581f4cb544a8d41e3..6f9efe4e5d286fc73a1ecf82e3986571
  public final class CraftServer implements Server {
      private final String serverName = "Paper"; // Paper
      private final String serverVersion;
-@@ -2234,5 +2237,24 @@ public final class CraftServer implements Server {
+@@ -2245,5 +2248,24 @@ public final class CraftServer implements Server {
      public boolean suggestPlayerNamesWhenNullTabCompletions() {
          return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
      }

Spigot-Server-Patches/0180-AsyncTabCompleteEvent.patch

@@ -72,10 +72,10 @@ index a3710f23d4ef254cda3fae83d8547507aa2a8696..4dc0b3a6054ef82ad675c30d30b6a7ad
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6f9efe4e5d286fc73a1ecf82e39865715ff03a33..2cc7c1038dae2c521fee5cf471c22221db0a22fc 100644
+index 6137bb510eec7d8c2ff2908b1255e56d1e2a39ef..2ace104c25b9e93ac643f17f99e3c01f979f7040 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1790,7 +1790,7 @@ public final class CraftServer implements Server {
+@@ -1792,7 +1792,7 @@ public final class CraftServer implements Server {
              offers = tabCompleteChat(player, message);
          }
  

Spigot-Server-Patches/0203-getPlayerUniqueId-API.patch

@@ -9,10 +9,10 @@ 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 2cc7c1038dae2c521fee5cf471c22221db0a22fc..f23d8f5138b8fb86d4e1bb985501375d1d2864f8 100644
+index 2ace104c25b9e93ac643f17f99e3c01f979f7040..f1bb3acf370ed71bc48116ce96396f999a34e83e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1486,6 +1486,26 @@ public final class CraftServer implements Server {
+@@ -1488,6 +1488,26 @@ public final class CraftServer implements Server {
          return recipients.size();
      }
  

Spigot-Server-Patches/0263-Add-Early-Warning-Feature-to-WatchDog.patch

@@ -48,10 +48,10 @@ index aef859fbb975821dd952c9d339a43acac98c99ef..f9608bf0eb4e3dfc573fe626e7da9fcc
                  long start = System.nanoTime(), curTime, tickSection = start; // Paper - Further improve server tick loop
                  lastTick = start - TICK_TIME; // Paper
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f23d8f5138b8fb86d4e1bb985501375d1d2864f8..edd6a946b8044a503f98a56dd1b6d65f7af1b0bc 100644
+index f1bb3acf370ed71bc48116ce96396f999a34e83e..dce11770da204b09cdc2f89dceccb3cf4fae7ac6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -804,6 +804,7 @@ public final class CraftServer implements Server {
+@@ -806,6 +806,7 @@ public final class CraftServer implements Server {
  
      @Override
      public void reload() {
@@ -59,7 +59,7 @@ index f23d8f5138b8fb86d4e1bb985501375d1d2864f8..edd6a946b8044a503f98a56dd1b6d65f
          reloadCount++;
          configuration = YamlConfiguration.loadConfiguration(getConfigFile());
          commandsConfiguration = YamlConfiguration.loadConfiguration(getCommandsConfigFile());
-@@ -922,6 +923,7 @@ public final class CraftServer implements Server {
+@@ -924,6 +925,7 @@ public final class CraftServer implements Server {
          enablePlugins(PluginLoadOrder.STARTUP);
          enablePlugins(PluginLoadOrder.POSTWORLD);
          getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.RELOAD));

Spigot-Server-Patches/0300-Add-Velocity-IP-Forwarding-Support.patch

@@ -276,10 +276,10 @@ index b52e8b72eaee87e227b7cc2fd66101550262cb7e..990cfea6c2339cd3cf688e4645de76dc
      public void a(PacketDataSerializer packetdataserializer) throws IOException {
          this.a = packetdataserializer.i();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index edd6a946b8044a503f98a56dd1b6d65f7af1b0bc..1fe737be6b65554c49ed6c10780b339896a30a6a 100644
+index dce11770da204b09cdc2f89dceccb3cf4fae7ac6..251433b5a0560cdfca298aca45c53191b74bc403 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -676,7 +676,7 @@ public final class CraftServer implements Server {
+@@ -678,7 +678,7 @@ public final class CraftServer implements Server {
      @Override
      public long getConnectionThrottle() {
          // Spigot Start - Automatically set connection throttle for bungee configurations

Spigot-Server-Patches/0314-Make-the-default-permission-message-configurable.patch

@@ -29,10 +29,10 @@ index 01d48da8b2f89ad3a615ad10c044c5f0a08ee4ed..f9b1b198299166759fe0bd0a36d8d88c
      private static void savePlayerData() {
          savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1fe737be6b65554c49ed6c10780b339896a30a6a..7c1d729238c836603c273dbd249af6332f2bee87 100644
+index 251433b5a0560cdfca298aca45c53191b74bc403..975b2b35324d5eb00a85b4771f68dd0b320c58e3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2260,6 +2260,11 @@ public final class CraftServer implements Server {
+@@ -2271,6 +2271,11 @@ public final class CraftServer implements Server {
          return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
      }
  

Spigot-Server-Patches/0352-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch

@@ -29,10 +29,10 @@ index 0cd08f390374ed9cdbcd0fee1a9204a142c642c9..3b8e9cf112b4656e9dc4d127e8f7568e
  
      public boolean isDebugging() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7c1d729238c836603c273dbd249af6332f2bee87..7c4645e71669eadd3914a107e87026a2b3cb313a 100644
+index 975b2b35324d5eb00a85b4771f68dd0b320c58e3..a4970ec90e27879ca82c3bdc0451984d5fe7af0d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1786,7 +1786,7 @@ public final class CraftServer implements Server {
+@@ -1788,7 +1788,7 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean isPrimaryThread() {

Spigot-Server-Patches/0385-Expose-the-internal-current-tick.patch

@@ -5,10 +5,10 @@ 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 7c4645e71669eadd3914a107e87026a2b3cb313a..13334bedfbef7ddc80ae7eb5832f1f37eac560a0 100644
+index a4970ec90e27879ca82c3bdc0451984d5fe7af0d..04a01b85c60e68347a32db5d92e53fc949622517 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2283,5 +2283,10 @@ public final class CraftServer implements Server {
+@@ -2294,5 +2294,10 @@ public final class CraftServer implements Server {
          }
          return new com.destroystokyo.paper.profile.CraftPlayerProfile(uuid, name);
      }

Spigot-Server-Patches/0390-Add-CraftMagicNumbers.isSupportedApiVersion.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add CraftMagicNumbers.isSupportedApiVersion()
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index b4f61448889255168a39aa2de5d66d8253e68963..15de8b6b1ecdd96548012743e34fa98ce911d410 100644
+index 185a0600e655f0ae85d22c438e9beb398cb12896..c2650f3cc597620b1cbddce3f60614936e9bb62c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -328,6 +328,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -348,6 +348,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
          return new com.destroystokyo.paper.PaperVersionFetcher();
      }

Spigot-Server-Patches/0435-Add-tick-times-API-and-mspt-command.patch

@@ -147,10 +147,10 @@ index f152eb73c0bb5d6e24c62665035406629acce8ff..be352c5e32600af8aa49feea307cba29
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 13334bedfbef7ddc80ae7eb5832f1f37eac560a0..89b03cacce01ae36aeb14e38510fc78977adf92f 100644
+index 04a01b85c60e68347a32db5d92e53fc949622517..055e32abc31b2606e0ee429b0e51738448c833a6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2133,6 +2133,16 @@ public final class CraftServer implements Server {
+@@ -2144,6 +2144,16 @@ public final class CraftServer implements Server {
                  net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
          };
      }

Spigot-Server-Patches/0436-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 89b03cacce01ae36aeb14e38510fc78977adf92f..c702275e2c37d9d66b085221f933697d11cc6571 100644
+index 055e32abc31b2606e0ee429b0e51738448c833a6..b86eb9afb170b8a827ce3f6c85de08c75f260b14 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2298,5 +2298,10 @@ public final class CraftServer implements Server {
+@@ -2309,5 +2309,10 @@ public final class CraftServer implements Server {
      public int getCurrentTick() {
          return net.minecraft.server.MinecraftServer.currentTick;
      }

Spigot-Server-Patches/0437-Add-Raw-Byte-ItemStack-Serialization.patch

@@ -50,10 +50,10 @@ index 6e6cabc03bc3822ee973bdafef8f4adb61b6c263..0282dcb68fa185b342f59c5aaafe8f42
          DataOutputStream dataoutputstream = new DataOutputStream(new BufferedOutputStream(new GZIPOutputStream(outputstream)));
          Throwable throwable = null;
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 15de8b6b1ecdd96548012743e34fa98ce911d410..e76187767eddba8c38cf59691dbe93279d3dc750 100644
+index c2650f3cc597620b1cbddce3f60614936e9bb62c..e4ffa9d69fbd8afed3fe9ae7d5b2bdbc90451799 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -333,6 +333,46 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -353,6 +353,46 @@ public final class CraftMagicNumbers implements UnsafeValues {
      public boolean isSupportedApiVersion(String apiVersion) {
          return apiVersion != null && SUPPORTED_API.contains(apiVersion);
      }

Spigot-Server-Patches/0441-Improved-Watchdog-Support.patch

@@ -324,10 +324,10 @@ index b3b2ae829b246764a18d22868d441579aaa68f3f..fc77588e325e9c18092c877c5e845e60
              String msg = "Entity threw exception at " + entity.world.getWorld().getName() + ":" + entity.locX() + "," + entity.locY() + "," + entity.locZ();
              System.err.println(msg);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c702275e2c37d9d66b085221f933697d11cc6571..3d9c6ebe28f25270ac8a7a5ce26ea6e95640c722 100644
+index b86eb9afb170b8a827ce3f6c85de08c75f260b14..dec85293caeaf247ef58975f1f7dfd2bb095635d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1786,7 +1786,7 @@ public final class CraftServer implements Server {
+@@ -1788,7 +1788,7 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean isPrimaryThread() {

Spigot-Server-Patches/0466-Expose-game-version.patch

@@ -5,10 +5,10 @@ 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 3d9c6ebe28f25270ac8a7a5ce26ea6e95640c722..3dfaa253257764c45db7971d78cc998008bb396a 100644
+index dec85293caeaf247ef58975f1f7dfd2bb095635d..0acaa3d463995a1863f97a6951fcbdfd61a8ef7e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -517,6 +517,13 @@ public final class CraftServer implements Server {
+@@ -519,6 +519,13 @@ public final class CraftServer implements Server {
          return bukkitVersion;
      }
  

Spigot-Server-Patches/0469-Implement-Mob-Goal-API.patch

@@ -873,10 +873,10 @@ index 22773eca7561d39cd838338efe6d40ab9421feba..2e56fcc32f914d2b5f4bb9d368f504f4
  
      public PathfinderGoalWrapped(int i, PathfinderGoal pathfindergoal) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3dfaa253257764c45db7971d78cc998008bb396a..1eec6cbf792e6aa935078ad9ecfd89a8db8db1b1 100644
+index 0acaa3d463995a1863f97a6951fcbdfd61a8ef7e..2b2d292fdd13d86159a791acfd1e70217401e795 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2310,5 +2310,11 @@ public final class CraftServer implements Server {
+@@ -2321,5 +2321,11 @@ public final class CraftServer implements Server {
      public boolean isStopping() {
          return net.minecraft.server.MinecraftServer.getServer().hasStopped();
      }

Spigot-Server-Patches/0480-Wait-for-Async-Tasks-during-shutdown.patch

@@ -22,10 +22,10 @@ index 4c21cd6ebfd78c0cbefc68ac446601050d41f6d6..fa64622f78399b934b9246b03d747ad0
          // CraftBukkit end
          if (this.getServerConnection() != null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 1eec6cbf792e6aa935078ad9ecfd89a8db8db1b1..4c29fc255186dfbc545b97ded81b68316f963b0a 100644
+index 2b2d292fdd13d86159a791acfd1e70217401e795..9319dccbe6a33001cfb27866fd1d078e73fcc1e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -933,6 +933,35 @@ public final class CraftServer implements Server {
+@@ -935,6 +935,35 @@ public final class CraftServer implements Server {
          org.spigotmc.WatchdogThread.hasStarted = true; // Paper - Disable watchdog early timeout on reload
      }
  

Spigot-Server-Patches/0499-Add-Plugin-Tickets-to-API-Chunk-Methods.patch

@@ -22,10 +22,10 @@ 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 4c29fc255186dfbc545b97ded81b68316f963b0a..8c16f3f920bfbc7b607229a4a5680baee9ae774d 100644
+index 9319dccbe6a33001cfb27866fd1d078e73fcc1e7..f27d734a1d94ff749f1d28f2509f4a0dc0fdd181 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -345,7 +345,7 @@ public final class CraftServer implements Server {
+@@ -347,7 +347,7 @@ public final class CraftServer implements Server {
          ambientSpawn = configuration.getInt("spawn-limits.ambient");
          console.autosavePeriod = configuration.getInt("ticks-per.autosave");
          warningState = WarningState.value(configuration.getString("settings.deprecated-verbose"));
@@ -34,7 +34,7 @@ index 4c29fc255186dfbc545b97ded81b68316f963b0a..8c16f3f920bfbc7b607229a4a5680bae
          minimumAPI = configuration.getString("settings.minimum-api");
          loadIcon();
      }
-@@ -828,7 +828,7 @@ public final class CraftServer implements Server {
+@@ -830,7 +830,7 @@ public final class CraftServer implements Server {
          waterAmbientSpawn = configuration.getInt("spawn-limits.water-ambient");
          ambientSpawn = configuration.getInt("spawn-limits.ambient");
          warningState = WarningState.value(configuration.getString("settings.deprecated-verbose"));

Spigot-Server-Patches/0529-Allow-delegation-to-vanilla-chunk-gen.patch

@@ -27,10 +27,10 @@ index b51613040e4583ff056060b47b1f97a86ebcde51..5366314e5f889b5b8d7740bbd0f024d9
  
                                  for (int l = 0; l < k; ++l) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 8c16f3f920bfbc7b607229a4a5680baee9ae774d..ac6659a171a6bd3a0d2149abce37598f43fa53fe 100644
+index f27d734a1d94ff749f1d28f2509f4a0dc0fdd181..588740661a0cb60ae55c38a12b5665cec097c902 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1973,6 +1973,29 @@ public final class CraftServer implements Server {
+@@ -1975,6 +1975,29 @@ public final class CraftServer implements Server {
          return new CraftChunkData(world);
      }
  

Spigot-Server-Patches/0556-Add-setMaxPlayers-API.patch

@@ -18,10 +18,10 @@ index 2ae926d9a2ad99a46409dfa000c6f895600a2616..787e80c50a61d6bd80efd8bd0d4b5140
      private EnumGamemode u;
      private boolean v;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ac6659a171a6bd3a0d2149abce37598f43fa53fe..fd649a0d2cd50c49722e42b61f236caa52f8cff8 100644
+index 588740661a0cb60ae55c38a12b5665cec097c902..d8d29d14559169f5e8d8b4cf63d8b427b823eb2f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -614,6 +614,13 @@ public final class CraftServer implements Server {
+@@ -616,6 +616,13 @@ public final class CraftServer implements Server {
          return playerList.getMaxPlayers();
      }
  

Spigot-Server-Patches/0572-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch

@@ -74,10 +74,10 @@ index f787238575ed7ac9108a2fd9782af55056219767..3524b677525bf2bb529b797fe1f258ef
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index e76187767eddba8c38cf59691dbe93279d3dc750..b5ec7a161b22d0a0d39a6e60ce015cbf3520651a 100644
+index e4ffa9d69fbd8afed3fe9ae7d5b2bdbc90451799..0b2bc20d1074757ab69eb6715d9b2d0d2065b2db 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -42,6 +42,7 @@ import org.bukkit.NamespacedKey;
+@@ -45,6 +45,7 @@ import org.bukkit.Registry;
  import org.bukkit.UnsafeValues;
  import org.bukkit.advancement.Advancement;
  import org.bukkit.block.data.BlockData;
@@ -85,7 +85,7 @@ index e76187767eddba8c38cf59691dbe93279d3dc750..b5ec7a161b22d0a0d39a6e60ce015cbf
  import org.bukkit.craftbukkit.block.data.CraftBlockData;
  import org.bukkit.craftbukkit.inventory.CraftItemStack;
  import org.bukkit.craftbukkit.legacy.CraftLegacy;
-@@ -373,6 +374,22 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -393,6 +394,22 @@ public final class CraftMagicNumbers implements UnsafeValues {
              throw new RuntimeException();
          }
      }

work/Bukkit

@@ -1 +1 @@
-Subproject commit 91957aa3b9b05c0a9243d7c360e284f508d925a8
+Subproject commit d75d8a38c4baaa944290d524f27f9bea83770318

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit d5a72960028deccea210ec9883403fd01e37b09e
+Subproject commit 890130b46025667e7d7d4ce2ba870dd2ddba1841