[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:
f1e73b03 #525: Add contributors plugin.yml field.
ef0999fe #529: Added getRecipe() method to retrieve a Recipe by it's NamespacedKey

CraftBukkit Changes:
8b831a965 #714: Added getRecipe() method to retrieve a Recipe by it's NamespacedKey

Spigot-API-Patches/0004-Timings-v2.patch

@@ -2778,7 +2778,7 @@ index 0000000000000000000000000000000000000000..5989ee21297935651b0edd44b8239e65
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index c1ecd19dd062276f5680b903309efce194559ae9..0b6ff0fe323397bb257f55bd2db21eba4ccc50f7 100644
+index 2e059809021ea639c27d8a202a2962de1dae8168..f1585968b13007b0f9b8c69ac3c2eff28a0fc89e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -640,7 +640,6 @@ public final class Bukkit {
@@ -2790,10 +2790,10 @@ index c1ecd19dd062276f5680b903309efce194559ae9..0b6ff0fe323397bb257f55bd2db21eba
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 5a99e36393f885003569977461923a9f6fa23402..113536d4c86a5aa863c4db2416caa41ca6bc55c0 100644
+index e43ba4c97b4a61e2b49c58553c39d0757521418d..6cbc22c08ce421bcd8bf3efabc96c9cec447faee 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1328,6 +1328,26 @@ public interface Server extends PluginMessageRecipient {
+@@ -1337,6 +1337,26 @@ public interface Server extends PluginMessageRecipient {
              throw new UnsupportedOperationException("Not supported yet.");
          }
  

Spigot-API-Patches/0006-Add-getTPS-method.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add getTPS method
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 0b6ff0fe323397bb257f55bd2db21eba4ccc50f7..15543603c168623572b1a26e41eb20058770784d 100644
+index f1585968b13007b0f9b8c69ac3c2eff28a0fc89e..59f0ba664dd945f24eaf9e38e98fdef0c4aaaa92 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1401,6 +1401,17 @@ public final class Bukkit {
+@@ -1412,6 +1412,17 @@ public final class Bukkit {
          return server.getEntity(uuid);
      }
  
@@ -27,10 +27,10 @@ index 0b6ff0fe323397bb257f55bd2db21eba4ccc50f7..15543603c168623572b1a26e41eb2005
       * Get the advancement specified by this key.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 113536d4c86a5aa863c4db2416caa41ca6bc55c0..3af00d77f9015f2eccab3047676b70c1af68daa7 100644
+index 6cbc22c08ce421bcd8bf3efabc96c9cec447faee..5cf43d538eee6eff031a93ab28f8f33c661acee3 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1176,6 +1176,16 @@ public interface Server extends PluginMessageRecipient {
+@@ -1185,6 +1185,16 @@ public interface Server extends PluginMessageRecipient {
      @Nullable
      Entity getEntity(@NotNull UUID uuid);
  

Spigot-API-Patches/0008-Version-Command-2.0.patch

@@ -72,7 +72,7 @@ index 945b8b030d1b2a13afc0c4efad76997eb7bf00ba..1b6d737046646c102b0d519ab3f67c3f
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index cbce524442ca1ab0e2ade966f11b7dfa30a3f569..0486abd193f3b3b07bdda6b791b01badd40395dc 100644
+index abbd1c35f9ac55ea61e94dd19d44c82628d1cb99..a47ed6b290c051ff076900028b929745aac0ba55 100644
 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 @@ -1,5 +1,6 @@
@@ -98,7 +98,7 @@ index cbce524442ca1ab0e2ade966f11b7dfa30a3f569..0486abd193f3b3b07bdda6b791b01bad
      public VersionCommand(@NotNull String name) {
          super(name);
  
-@@ -150,18 +160,18 @@ public class VersionCommand extends BukkitCommand {
+@@ -153,18 +163,18 @@ public class VersionCommand extends BukkitCommand {
  
      private void sendVersion(@NotNull CommandSender sender) {
          if (hasVersion) {
@@ -120,7 +120,7 @@ index cbce524442ca1ab0e2ade966f11b7dfa30a3f569..0486abd193f3b3b07bdda6b791b01bad
                  return;
              }
              versionWaiters.add(sender);
-@@ -183,7 +193,12 @@ public class VersionCommand extends BukkitCommand {
+@@ -186,7 +196,12 @@ public class VersionCommand extends BukkitCommand {
  
      private void obtainVersion() {
          String version = Bukkit.getVersion();
@@ -134,7 +134,7 @@ index cbce524442ca1ab0e2ade966f11b7dfa30a3f569..0486abd193f3b3b07bdda6b791b01bad
          if (version.startsWith("git-Spigot-")) {
              String[] parts = version.substring("git-Spigot-".length()).split("-");
              int cbVersions = getDistance("craftbukkit", parts[1].substring(0, parts[1].indexOf(' ')));
-@@ -213,6 +228,9 @@ public class VersionCommand extends BukkitCommand {
+@@ -216,6 +231,9 @@ public class VersionCommand extends BukkitCommand {
          } else {
              setVersionMessage("Unknown version, custom build?");
          }
@@ -144,7 +144,7 @@ index cbce524442ca1ab0e2ade966f11b7dfa30a3f569..0486abd193f3b3b07bdda6b791b01bad
      }
  
      private void setVersionMessage(@NotNull String msg) {
-@@ -222,8 +240,13 @@ public class VersionCommand extends BukkitCommand {
+@@ -225,8 +243,13 @@ public class VersionCommand extends BukkitCommand {
          try {
              hasVersion = true;
              versionTaskStarted = false;
@@ -159,7 +159,7 @@ index cbce524442ca1ab0e2ade966f11b7dfa30a3f569..0486abd193f3b3b07bdda6b791b01bad
              }
              versionWaiters.clear();
          } finally {
-@@ -231,6 +254,15 @@ public class VersionCommand extends BukkitCommand {
+@@ -234,6 +257,15 @@ public class VersionCommand extends BukkitCommand {
          }
      }
  

Spigot-API-Patches/0014-Expose-server-CommandMap.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 15543603c168623572b1a26e41eb20058770784d..b46222ed2822fea563585462e43ee73ba2bb9b37 100644
+index 59f0ba664dd945f24eaf9e38e98fdef0c4aaaa92..9433934d52e637ca340934350b43d4c827ee9606 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1575,6 +1575,19 @@ public final class Bukkit {
+@@ -1586,6 +1586,19 @@ public final class Bukkit {
          return server.getUnsafe();
      }
  
@@ -29,10 +29,10 @@ index 15543603c168623572b1a26e41eb20058770784d..b46222ed2822fea563585462e43ee73b
      public static Server.Spigot spigot() {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 3af00d77f9015f2eccab3047676b70c1af68daa7..d3c498ad0e7681422ef2117be41c6603ebce0e0a 100644
+index 5cf43d538eee6eff031a93ab28f8f33c661acee3..620a16eaa74a31711b8598a70c9e9ed0f361ceb8 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1186,6 +1186,15 @@ public interface Server extends PluginMessageRecipient {
+@@ -1195,6 +1195,15 @@ public interface Server extends PluginMessageRecipient {
      public double[] getTPS();
      // Paper end
  

Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 7b1978a258cbf74983dc2512092653ed4ff64e98..a0473d6b5339513f10749c0498b2ef5a0d710b14 100644
+index 071e27179e44e2a3a33b9c4fb900378c5fd9c34f..c10165f9fc2317a29c3bef7fa0dc0e308f64b7aa 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1606,6 +1606,13 @@ public final class Bukkit {
+@@ -1617,6 +1617,13 @@ public final class Bukkit {
      public static org.bukkit.command.CommandMap getCommandMap() {
          return server.getCommandMap();
      }
@@ -24,10 +24,10 @@ index 7b1978a258cbf74983dc2512092653ed4ff64e98..a0473d6b5339513f10749c0498b2ef5a
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e3385abec44c603201aa37e3b3180cf88d378b52..a13c5014e0815d1de0bab184ea365bc6f97dcd8f 100644
+index 2387c04e8a4d14f04e7e4d09f7120d48a98703aa..c0fd1543a902cf4ff28207b5786af69fbe94a468 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1416,4 +1416,6 @@ public interface Server extends PluginMessageRecipient {
+@@ -1425,4 +1425,6 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      Spigot spigot();
      // Spigot end

Spigot-API-Patches/0038-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/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index a0473d6b5339513f10749c0498b2ef5a0d710b14..6f2b67774a989ade2ec8acafd9f5288d51fb2102 100644
+index c10165f9fc2317a29c3bef7fa0dc0e308f64b7aa..dbf14b0953c254a677ad134e524607b2a057f36e 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1613,6 +1613,15 @@ public final class Bukkit {
+@@ -1624,6 +1624,15 @@ public final class Bukkit {
      public static void reloadPermissions() {
          server.reloadPermissions();
      }
@@ -26,10 +26,10 @@ index a0473d6b5339513f10749c0498b2ef5a0d710b14..6f2b67774a989ade2ec8acafd9f5288d
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index a13c5014e0815d1de0bab184ea365bc6f97dcd8f..339463eb75e3cb4a9d025892835d54b6ce76c478 100644
+index c0fd1543a902cf4ff28207b5786af69fbe94a468..9e90a69ad2231c4d2d4c778b9a3095e908f22f1e 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1418,4 +1418,6 @@ public interface Server extends PluginMessageRecipient {
+@@ -1427,4 +1427,6 @@ public interface Server extends PluginMessageRecipient {
      // Spigot end
  
      void reloadPermissions(); // Paper

Spigot-API-Patches/0049-Add-configuration-option-to-prevent-player-names-fro.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 6f2b67774a989ade2ec8acafd9f5288d51fb2102..c5b6e5fa0cfd876733b2010494ad7bbeafc789f8 100644
+index dbf14b0953c254a677ad134e524607b2a057f36e..016efcee2abefb3e92c59527e8762ee51956bc81 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1622,6 +1622,16 @@ public final class Bukkit {
+@@ -1633,6 +1633,16 @@ public final class Bukkit {
      public static boolean reloadCommandAliases() {
          return server.reloadCommandAliases();
      }
@@ -27,10 +27,10 @@ index 6f2b67774a989ade2ec8acafd9f5288d51fb2102..c5b6e5fa0cfd876733b2010494ad7bbe
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 339463eb75e3cb4a9d025892835d54b6ce76c478..457007005f9ff5f6818c559635379a2e698fc4d7 100644
+index 9e90a69ad2231c4d2d4c778b9a3095e908f22f1e..843b3f949d60cd78df830208bf98a93346f8d754 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1420,4 +1420,14 @@ public interface Server extends PluginMessageRecipient {
+@@ -1429,4 +1429,14 @@ public interface Server extends PluginMessageRecipient {
      void reloadPermissions(); // Paper
  
      boolean reloadCommandAliases(); // Paper

Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch

@@ -267,10 +267,10 @@ index 0000000000000000000000000000000000000000..7b3b6ef533d32169fbeca389bd61cfc6
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index c5b6e5fa0cfd876733b2010494ad7bbeafc789f8..d27405a8cfa590c13f5a3976c74c05655ae1f93d 100644
+index 016efcee2abefb3e92c59527e8762ee51956bc81..039c44654621c434a8cc1fa4a2dc46ede793054a 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1632,6 +1632,40 @@ public final class Bukkit {
+@@ -1643,6 +1643,40 @@ public final class Bukkit {
      public static boolean suggestPlayerNamesWhenNullTabCompletions() {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
@@ -312,10 +312,10 @@ index c5b6e5fa0cfd876733b2010494ad7bbeafc789f8..d27405a8cfa590c13f5a3976c74c0565
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 457007005f9ff5f6818c559635379a2e698fc4d7..24922e5699241e29bc615dcffadce21c89f6ff35 100644
+index 843b3f949d60cd78df830208bf98a93346f8d754..5582e377bb2a85b94d0c9c2a90d5b488991af098 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1429,5 +1429,33 @@ public interface Server extends PluginMessageRecipient {
+@@ -1438,5 +1438,33 @@ public interface Server extends PluginMessageRecipient {
       * @return true if player names should be suggested
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();

Spigot-API-Patches/0163-Make-the-default-permission-message-configurable.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Make the default permission message configurable
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 4b6b1bce3a728d74f8b791efd2d981e907e202bc..e372ca2339bc25d6110bf95e159703630acca215 100644
+index 97ed7d9f6415219db4d6b0054dc3d2afeb1ce6e5..c6834080859051bdd0f33f2c9e9a8e48d7dbd31b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1647,6 +1647,15 @@ public final class Bukkit {
+@@ -1658,6 +1658,15 @@ public final class Bukkit {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
  
@@ -25,10 +25,10 @@ index 4b6b1bce3a728d74f8b791efd2d981e907e202bc..e372ca2339bc25d6110bf95e15970363
       * Creates a PlayerProfile for the specified uuid, with name as null
       * @param uuid UUID to create profile for
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index a2420771ca49acc08826ca60fcda7495c80cf1d5..8bbb2efe835b575733b560fe5e2b824e1a859d09 100644
+index da9c85372605ab0d68f21bb38885eb0f4dfebded..47e6a3f2bd41a9a01ec74e4c3f4919098ba88614 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1442,6 +1442,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1451,6 +1451,13 @@ public interface Server extends PluginMessageRecipient {
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();
  
@@ -43,7 +43,7 @@ index a2420771ca49acc08826ca60fcda7495c80cf1d5..8bbb2efe835b575733b560fe5e2b824e
       * Creates a PlayerProfile for the specified uuid, with name as null
       * @param uuid UUID to create profile for
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 03bdc1622791e1206406c87065978688d602e39e..0b0d1bd7c4d5ca5241561211e86a9d1acf1893d2 100644
+index 7c80dc54776d0d66f7816b77136f6dbd9b801704..c10fc8d2386301bc2caddcdb1cd18566bcaa8689 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -185,7 +185,7 @@ public abstract class Command {

Spigot-API-Patches/0177-Flip-some-Spigot-API-null-annotations.patch

@@ -9,10 +9,10 @@ a ton of noise to plugin developers.
 These do not help plugin developers if they bring moise noise than value.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index e372ca2339bc25d6110bf95e159703630acca215..12603c91046abf1ab58e8b797904b2cdafa7c9af 100644
+index c6834080859051bdd0f33f2c9e9a8e48d7dbd31b..6b3af64ecd0b96b995f54389b15fc995f2cf78f1 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1243,7 +1243,7 @@ public final class Bukkit {
+@@ -1254,7 +1254,7 @@ public final class Bukkit {
       *
       * @return the scoreboard manager or null if no worlds are loaded.
       */
@@ -21,7 +21,7 @@ index e372ca2339bc25d6110bf95e159703630acca215..12603c91046abf1ab58e8b797904b2cd
      public static ScoreboardManager getScoreboardManager() {
          return server.getScoreboardManager();
      }
-@@ -1540,7 +1540,7 @@ public final class Bukkit {
+@@ -1551,7 +1551,7 @@ public final class Bukkit {
       * @param clazz the class of the tag entries
       * @return the tag or null
       */
@@ -31,7 +31,7 @@ index e372ca2339bc25d6110bf95e159703630acca215..12603c91046abf1ab58e8b797904b2cd
          return server.getTag(registry, tag, clazz);
      }
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 6e1a1124a6e528c1a94ccb1d09bc5dccf056b0b8..77d9cd0a1f54b5eb233eddbcff1bfa76bc182e9a 100644
+index 9c91c49ed7302c12fcb1d8e9bc58712efc199954..d5d67b3d84cd88ed0f858497e68535ec0162c700 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
 @@ -46,7 +46,7 @@ public class Location implements Cloneable, ConfigurationSerializable {
@@ -62,10 +62,10 @@ index 6e1a1124a6e528c1a94ccb1d09bc5dccf056b0b8..77d9cd0a1f54b5eb233eddbcff1bfa76
          if (this.world == null) {
              return null;
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8bbb2efe835b575733b560fe5e2b824e1a859d09..b46644bc97122814f80a44e6ff0b848f4cf132b7 100644
+index 47e6a3f2bd41a9a01ec74e4c3f4919098ba88614..670c02976500fa2953f05027ec7c895b75fe7225 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1042,7 +1042,7 @@ public interface Server extends PluginMessageRecipient {
+@@ -1051,7 +1051,7 @@ public interface Server extends PluginMessageRecipient {
       *
       * @return the scoreboard manager or null if no worlds are loaded.
       */
@@ -74,7 +74,7 @@ index 8bbb2efe835b575733b560fe5e2b824e1a859d09..b46644bc97122814f80a44e6ff0b848f
      ScoreboardManager getScoreboardManager();
  
      /**
-@@ -1312,7 +1312,7 @@ public interface Server extends PluginMessageRecipient {
+@@ -1321,7 +1321,7 @@ public interface Server extends PluginMessageRecipient {
       * @param clazz the class of the tag entries
       * @return the tag or null
       */

Spigot-API-Patches/0186-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/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 12603c91046abf1ab58e8b797904b2cdafa7c9af..6a0fee5e81e4d97b624af2718595b63e4d7a95b2 100644
+index 6b3af64ecd0b96b995f54389b15fc995f2cf78f1..018a8c871f3afdd8b6e1b156b2113f62e330e3d3 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1689,6 +1689,10 @@ public final class Bukkit {
+@@ -1700,6 +1700,10 @@ public final class Bukkit {
      public static com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name) {
          return server.createProfile(uuid, name);
      }
@@ -20,10 +20,10 @@ index 12603c91046abf1ab58e8b797904b2cdafa7c9af..6a0fee5e81e4d97b624af2718595b63e
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b46644bc97122814f80a44e6ff0b848f4cf132b7..ea6c86c8979ea6253b00c99b4f9cfcd1621beff0 100644
+index 670c02976500fa2953f05027ec7c895b75fe7225..93337d6eaf27999043ae09e7240689e7c4e78ace 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1476,5 +1476,12 @@ public interface Server extends PluginMessageRecipient {
+@@ -1485,5 +1485,12 @@ public interface Server extends PluginMessageRecipient {
       */
      @NotNull
      com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name);

Spigot-API-Patches/0192-Add-tick-times-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add tick times API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 6a0fee5e81e4d97b624af2718595b63e4d7a95b2..eb2fb4cdc4e7585017acfce0198bb0746d2255cc 100644
+index 018a8c871f3afdd8b6e1b156b2113f62e330e3d3..1b9f18b3a48e5f31b1cecbf7ab40c86fef4f44bd 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1444,6 +1444,25 @@ public final class Bukkit {
+@@ -1455,6 +1455,25 @@ public final class Bukkit {
      public static double[] getTPS() {
          return server.getTPS();
      }
@@ -35,10 +35,10 @@ index 6a0fee5e81e4d97b624af2718595b63e4d7a95b2..eb2fb4cdc4e7585017acfce0198bb074
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index ea6c86c8979ea6253b00c99b4f9cfcd1621beff0..8cb38856d85e9239a132234fdc6af88f3adfe5b7 100644
+index 93337d6eaf27999043ae09e7240689e7c4e78ace..a07c848039e8a36e07d5362bda499f113bb61f1e 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1216,6 +1216,21 @@ public interface Server extends PluginMessageRecipient {
+@@ -1225,6 +1225,21 @@ public interface Server extends PluginMessageRecipient {
       */
      @NotNull
      public double[] getTPS();

Spigot-API-Patches/0193-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/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index eb2fb4cdc4e7585017acfce0198bb0746d2255cc..600334831293793840511992048c43bff1febc24 100644
+index 1b9f18b3a48e5f31b1cecbf7ab40c86fef4f44bd..b7d260fd7d1a869fb0d04e29012d540f49d9b82a 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1712,6 +1712,15 @@ public final class Bukkit {
+@@ -1723,6 +1723,15 @@ public final class Bukkit {
      public static int getCurrentTick() {
          return server.getCurrentTick();
      }
@@ -26,10 +26,10 @@ index eb2fb4cdc4e7585017acfce0198bb0746d2255cc..600334831293793840511992048c43bf
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8cb38856d85e9239a132234fdc6af88f3adfe5b7..f44a582e954625a12b19d4e142865e5d3154edd5 100644
+index a07c848039e8a36e07d5362bda499f113bb61f1e..2dfecdd73f911f657ee30c4848c903c522d97bcb 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1498,5 +1498,12 @@ public interface Server extends PluginMessageRecipient {
+@@ -1507,5 +1507,12 @@ public interface Server extends PluginMessageRecipient {
       * @return Current tick
       */
      int getCurrentTick();

Spigot-API-Patches/0202-Add-Mob-Goal-API.patch

@@ -440,10 +440,10 @@ index 0000000000000000000000000000000000000000..d7f1b2c84aebe8ed04084b9249ed08d5
 +    GoalKey<Mob> UNIVERSAL_ANGER_RESET = GoalKey.of(Mob.class, NamespacedKey.minecraft("universal_anger_reset"));
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index c0421b5a09c25ad4f23387b8b0e035871a9d367b..329e2dd1c057788d6bb5a1adc7ee9282820e927d 100644
+index c020912df1625da34a9f29ee2ea74835e9ae1e79..2d981b2481dfb428b2f6a27b5649b7e6148a8776 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1733,6 +1733,16 @@ public final class Bukkit {
+@@ -1744,6 +1744,16 @@ public final class Bukkit {
      public static boolean isStopping() {
          return server.isStopping();
      }
@@ -461,10 +461,10 @@ index c0421b5a09c25ad4f23387b8b0e035871a9d367b..329e2dd1c057788d6bb5a1adc7ee9282
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 0ad848c42039eeed64cc0b8372d3a9331e61d286..b464cc1a70aca3450a5de84a657a1e069a1a8ab6 100644
+index 13bf8dcc23986ad4f3761d9b395d278df7caa958..bad2ae145ca8fd1e7eb07f0507a743c4ffd23030 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1515,5 +1515,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1524,5 +1524,13 @@ public interface Server extends PluginMessageRecipient {
       * @return true if server is in the process of being shutdown
       */
      boolean isStopping();

Spigot-API-Patches/0217-Allow-delegation-to-vanilla-chunk-gen.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 329e2dd1c057788d6bb5a1adc7ee9282820e927d..4e92ce18227c8f650fe5c6f4a670e6f56d629872 100644
+index 2d981b2481dfb428b2f6a27b5649b7e6148a8776..62cc1c74c11f56dcbd1e24e9c5478497742e6351 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1344,6 +1344,22 @@ public final class Bukkit {
+@@ -1355,6 +1355,22 @@ public final class Bukkit {
          return server.createChunkData(world);
      }
  
@@ -32,10 +32,10 @@ index 329e2dd1c057788d6bb5a1adc7ee9282820e927d..4e92ce18227c8f650fe5c6f4a670e6f5
       * Creates a boss bar instance to display to players. The progress
       * defaults to 1.0
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b464cc1a70aca3450a5de84a657a1e069a1a8ab6..0653e0ffe96748dc971ec7e8027f8159696adf62 100644
+index bad2ae145ca8fd1e7eb07f0507a743c4ffd23030..6e01bf2d52e8bb6de7395f50c12f16c64aef72ae 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1127,6 +1127,20 @@ public interface Server extends PluginMessageRecipient {
+@@ -1136,6 +1136,20 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      public ChunkGenerator.ChunkData createChunkData(@NotNull World world);
  

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

@@ -671,7 +671,7 @@ index 5ffc84b40454e0d04e449e8b895fd5a44ebf34f6..c2403484daa7d0973b27654a9b48d094
          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 d05c57ce64b7d880ffd7dbd387d56f05f05cd3f0..239fa2404859d233161764cceec5cd0fc37899b9 100644
+index 99cba42566433fdd68d432cae80d98a310c98460..23ee1e59bbc560eb2f405fccf4170dcff278be3d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -803,6 +803,7 @@ public final class CraftServer implements Server {
@@ -698,7 +698,7 @@ index d05c57ce64b7d880ffd7dbd387d56f05f05cd3f0..239fa2404859d233161764cceec5cd0f
          overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
          ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2079,4 +2082,35 @@ public final class CraftServer implements Server {
+@@ -2086,4 +2089,35 @@ public final class CraftServer implements Server {
      {
          return spigot;
      }

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

@@ -1489,7 +1489,7 @@ index 2c671629a43f42da8335e7216f9fd399bb878729..eb3269e0ea3ce33d08e9eee3bca7cf43
                      PlayerConnectionUtils.LOGGER.debug("Ignoring packet due to disconnection: " + packet);
                  }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index b9b055923bb70e7b9fc9cd69c28bd06d7836a38c..213e8512247e9873563ad606a7e3a2a3ca409718 100644
+index f268cf1c82d66704793b817ab7cc4815b1a39e54..60a8fdbd6e458dfdc3e4449d71464bb5d5c5bd20 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1628,7 +1628,7 @@ index fc7e29abc5a2e4fdf03f61e54c2ab716273df813..35920c82ef9b79a6d8f806b90f2f8dbd
              CrashReport crashreport = CrashReport.a(throwable, "Ticking entity");
              CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being ticked");
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index d643ff0a0ae9d45711c9a40fc12af68157604a33..4b2d67b8f147015c3ecdd19f79b2719ff079c26a 100644
+index f89611f1d8ef318a4141d62ea6a2583bd365d3f1..df63ea6680e9619e09477ed44a021e128314436c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -3,6 +3,8 @@ package net.minecraft.server;
@@ -1750,10 +1750,10 @@ index d643ff0a0ae9d45711c9a40fc12af68157604a33..4b2d67b8f147015c3ecdd19f79b2719f
  
          // 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 239fa2404859d233161764cceec5cd0fc37899b9..c6c4033b16df4d31e87f4dca8d9293698e03958a 100644
+index 23ee1e59bbc560eb2f405fccf4170dcff278be3d..89143ae11ae485d7d3d602d2f535e2fc240201f1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2052,12 +2052,31 @@ public final class CraftServer implements Server {
+@@ -2059,12 +2059,31 @@ public final class CraftServer implements Server {
      private final Spigot spigot = new Spigot()
      {
  

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

@@ -140,10 +140,10 @@ index 9eacc1ba58986c21c5d8dc8d8d14c6f3b48fd171..7b58499c24d5a4296cc539087ca86d2e
                      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 a07014ecb5789b4df4a770407f96c8c6edc6c579..4edc9d892a18f7ea2b22f597ee075b09cf843eaf 100644
+index a19e208415a5918414d61304de4bd282725bef56..44a7c6377baa210862ce0ccf60ad0f16d8a839b9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2049,6 +2049,17 @@ public final class CraftServer implements Server {
+@@ -2056,6 +2056,17 @@ public final class CraftServer implements Server {
          return CraftMagicNumbers.INSTANCE;
      }
  

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 e6836b4afa60de8990cbc3e8a3bb39edd753782e..6fdc6caa4d58aea28911442ac29d7420926b30f4 100644
+index e3e938801cd97fbae2802e8962c70e5d2e66f5f0..dbc2fa67426794d7c023c5c984ca165d734652be 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1703,6 +1703,7 @@ public final class CraftServer implements Server {
+@@ -1710,6 +1710,7 @@ public final class CraftServer implements Server {
          return helpMap;
      }
  

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 aa74c838147d67c9cbfcff1f9b0dc653808fb109..7c4ef70f540de9d5486d1ccef65ef8d82580694e 100644
+index 3c5b3ab38c22dd127caa2218e9bc62baf7cf5760..ed6832b13c4e59afb2e8e74f075c991f9f91de39 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2168,5 +2168,23 @@ public final class CraftServer implements Server {
+@@ -2175,5 +2175,23 @@ public final class CraftServer implements Server {
              return null;
          }
      }

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 660f0362303df0fa990fa8f1507435666445c228..6d466ddc9c373fe314bf4d113a10407edeb9b22d 100644
+index b98efc399fd6d8af53c3a2b74bbbdb97d9ea11e8..6b4886371637f0a8adee638ca07e181dd675708e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1481,7 +1481,8 @@ public final class CraftServer implements Server {
+@@ -1488,7 +1488,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 6d466ddc9c373fe314bf4d113a10407edeb9b22d..d83e3be6f1997b993f6d4e65b190af5ad3056328 100644
+index 6b4886371637f0a8adee638ca07e181dd675708e..c98157c561d1c75499f0a8cb8580a04aef24f2a1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2197,5 +2197,24 @@ public final class CraftServer implements Server {
+@@ -2204,5 +2204,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 d83e3be6f1997b993f6d4e65b190af5ad3056328..bd06db4fa4ea5d8db45f4f0bc1222bb1da8a3230 100644
+index c98157c561d1c75499f0a8cb8580a04aef24f2a1..e1f205ae83ed537bc7f73647c1518e383e046de0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2216,5 +2216,10 @@ public final class CraftServer implements Server {
+@@ -2223,5 +2223,10 @@ public final class CraftServer implements Server {
          commandMap.registerServerAliases();
          return true;
      }

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

@@ -519,7 +519,7 @@ index 4f769211cf98c3da720a904da3dcdcd4c7611f0b..a038397028848edb4f43cd4f72625466
  
          private UserCacheEntry(GameProfile gameprofile, Date date) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 33727f110d8025394536434fa2b474f653a1f16d..73b69d4acda27995961306831c39696604559ad6 100644
+index 30b0fe2f9168de8549481909e5d32cbd8ce4d09d..dd439acf4985ee7f4f329c63060988c10c6671f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -227,6 +227,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -532,7 +532,7 @@ index 33727f110d8025394536434fa2b474f653a1f16d..73b69d4acda27995961306831c396966
  public final class CraftServer implements Server {
      private final String serverName = "Paper"; // Paper
      private final String serverVersion;
-@@ -2233,5 +2236,24 @@ public final class CraftServer implements Server {
+@@ -2240,5 +2243,24 @@ public final class CraftServer implements Server {
      public boolean suggestPlayerNamesWhenNullTabCompletions() {
          return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
      }

Spigot-Server-Patches/0181-AsyncTabCompleteEvent.patch

@@ -72,10 +72,10 @@ index 76cd3ea9512f4355a055d9c683d939680dc5a1b7..ccf083fbfa97b2a24338a3c1fe18e9a8
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 73b69d4acda27995961306831c39696604559ad6..bfe812fdb3aca643634281a57c4f94509dbe70b1 100644
+index dd439acf4985ee7f4f329c63060988c10c6671f3..a4114ed9f4aad72acc2cd21852614a11594569c4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1789,7 +1789,7 @@ public final class CraftServer implements Server {
+@@ -1796,7 +1796,7 @@ public final class CraftServer implements Server {
              offers = tabCompleteChat(player, message);
          }
  

Spigot-Server-Patches/0204-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 bfe812fdb3aca643634281a57c4f94509dbe70b1..79c4ed5aa074b00d7026311f22d5a9e44666ed62 100644
+index a4114ed9f4aad72acc2cd21852614a11594569c4..90d0c8f4f48c514a003c119e47e869bc8d399839 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1485,6 +1485,26 @@ public final class CraftServer implements Server {
+@@ -1492,6 +1492,26 @@ public final class CraftServer implements Server {
          return recipients.size();
      }
  

Spigot-Server-Patches/0319-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 86f881b76453c974cf648beaf7dbcc52df38abda..5f3ca7ffeefcc5ea825b66f86763e3dc550c01af 100644
+index d7aec47c3ba553fb505b5f956850aa2e9077dd24..97cf3c094ceea2ee5ea8d5fe82ac992caf38bd66 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2259,6 +2259,11 @@ public final class CraftServer implements Server {
+@@ -2266,6 +2266,11 @@ public final class CraftServer implements Server {
          return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
      }
  

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

@@ -29,10 +29,10 @@ index a97e6bc15dd07594379475e5dec0fc957ca1314a..b9e047643e1c3f84f26d936fcb067f60
  
      public boolean isDebugging() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5f3ca7ffeefcc5ea825b66f86763e3dc550c01af..04349821b5ffdc9e7f81de072bfb01b1b6dcf684 100644
+index 97cf3c094ceea2ee5ea8d5fe82ac992caf38bd66..80ed8abb4e5b1d13a17ba7d87b628c23944bea92 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1785,7 +1785,7 @@ public final class CraftServer implements Server {
+@@ -1792,7 +1792,7 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean isPrimaryThread() {

Spigot-Server-Patches/0391-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 04349821b5ffdc9e7f81de072bfb01b1b6dcf684..f3169a2b9b2c4a06d6502cb96ddca8616cbcbf32 100644
+index 80ed8abb4e5b1d13a17ba7d87b628c23944bea92..4f9917af2ebb11266afe925daac154c8e2e9479b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2282,5 +2282,10 @@ public final class CraftServer implements Server {
+@@ -2289,5 +2289,10 @@ public final class CraftServer implements Server {
          }
          return new com.destroystokyo.paper.profile.CraftPlayerProfile(uuid, name);
      }

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

@@ -147,10 +147,10 @@ index 5b6f3d811ff55d0c6d55bddc7707ef878baff782..04eb2af28f9843ef7641f5464d2a043c
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index f3169a2b9b2c4a06d6502cb96ddca8616cbcbf32..831d03ec0b60757450acfff1260ffab03e37039b 100644
+index 4f9917af2ebb11266afe925daac154c8e2e9479b..ff7456a744bb0e42ba96fcb699690de82582a06d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2132,6 +2132,16 @@ public final class CraftServer implements Server {
+@@ -2139,6 +2139,16 @@ public final class CraftServer implements Server {
                  net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
          };
      }

Spigot-Server-Patches/0442-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 831d03ec0b60757450acfff1260ffab03e37039b..f7e1f50c672705802b1ee9e2413211882ad21b97 100644
+index ff7456a744bb0e42ba96fcb699690de82582a06d..9111bc559353bc09eaf9a05a35b2d921f54b9f10 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2297,5 +2297,10 @@ public final class CraftServer implements Server {
+@@ -2304,5 +2304,10 @@ public final class CraftServer implements Server {
      public int getCurrentTick() {
          return net.minecraft.server.MinecraftServer.currentTick;
      }

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

@@ -41,7 +41,7 @@ This also moves all plugins who register "delayed init" tasks to occur just befo
 are properly accounted for and wont trip watchdog on init.
 
 diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
-index e257d6b36e0e78dac5b8320017d92776171e1bb0..24641501aeae0f2c2c5ce877775c7b971fb051bf 100644
+index f2a0a9f5d86820ce8098301256d2faf3d1a7c697..8a19c96499c22f0d4705613ffec38d5677e1a72d 100644
 --- a/src/main/java/com/destroystokyo/paper/Metrics.java
 +++ b/src/main/java/com/destroystokyo/paper/Metrics.java
 @@ -86,6 +86,9 @@ public class Metrics {
@@ -271,7 +271,7 @@ index 04eb2af28f9843ef7641f5464d2a043c696de864..d9ed9df3021dab1f5ee0a51215a00225
              this.customFunctionData.a(this.dataPackResources.a());
              this.ak.a(this.dataPackResources.h());
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index bb4d54ebee573964cf3026888da108584b12972f..09f94bd242318155dbb46e12224ad3e47eed40cf 100644
+index c31e7c977194c953a47f5f04d9f90442a88e2db3..6e7754588960a1e6ceacc8b4cfd8237a10e210bb 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -486,6 +486,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -283,7 +283,7 @@ index bb4d54ebee573964cf3026888da108584b12972f..09f94bd242318155dbb46e12224ad3e4
                  list.stream().map((playerchunk) -> {
                      CompletableFuture completablefuture;
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 502f4b93e04c78f4681459abfb160c6fc2279c72..bbe41a108b424abd3b3acfdfee4d368467a2c52e 100644
+index 4676b4dc4b22c838c946a342af9e88b56436de70..db049d529c4ed9157a1136695e5cd14429fd442f 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -429,7 +429,7 @@ public abstract class PlayerList {
@@ -308,7 +308,7 @@ index 5579044782f155f587de1e2ea5115bde6053f722..e8075ad6b5395c7dce12741fe85dafd1
          a(SystemUtils.e);
          a(SystemUtils.f);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 93df6a29035bb3cc96409b145a2e1433d38bbe99..418ba04a837ee2b17cc679edd35ba09830c01f28 100644
+index a31d293a00d325e4ee1eba48126b112df117fcfc..bcfa630ae8d7a1454ea2f8e6e88b8902cb586467 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -846,6 +846,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -328,10 +328,10 @@ index 93df6a29035bb3cc96409b145a2e1433d38bbe99..418ba04a837ee2b17cc679edd35ba098
              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 f7e1f50c672705802b1ee9e2413211882ad21b97..7981f23d043142615a6a0043ba748b22532ded22 100644
+index 9111bc559353bc09eaf9a05a35b2d921f54b9f10..c80fd400cd6eb2c31890ebce55844da36a84c7d0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1785,7 +1785,7 @@ public final class CraftServer implements Server {
+@@ -1792,7 +1792,7 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean isPrimaryThread() {
@@ -341,7 +341,7 @@ index f7e1f50c672705802b1ee9e2413211882ad21b97..7981f23d043142615a6a0043ba748b22
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 5ec16547a20271074d034f7fbcb43e86cb1597e6..3e4454a14fdf6305b262c15cf67203854debef28 100644
+index 2049f9783bf93c56d8c4dcb395293c03f09b5b40..ac8f1681d91251ff84938f94fc59db97560000d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -150,6 +150,37 @@ public class Main {

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

@@ -870,10 +870,10 @@ index 96f4401044cacf88e8e00b5b18821c105e634fba..112d8bab65bf41263a477c5faa717687
  
      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 ed08106c56974bebed1a32a1c865e1169308c787..b62e068d5af2b9a43796c721e5cc291976d933a1 100644
+index 38700faee15b901a0240401d50ed0dc7de211c37..810c0236da937ecbd12a10c5beffe0859842e056 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2309,5 +2309,11 @@ public final class CraftServer implements Server {
+@@ -2316,5 +2316,11 @@ public final class CraftServer implements Server {
      public boolean isStopping() {
          return net.minecraft.server.MinecraftServer.getServer().hasStopped();
      }

Spigot-Server-Patches/0537-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 56bf840e3d514153ed249093761ddcc04b282403..d8103ab0d542ced4f30b88ceb4fc4c3eedd5d9a0 100644
+index 506e76eecd4be892bdc70367c0ee4d9764569ca7..6282a05ae855a6b55eec4980fbc1b356f65f500e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1972,6 +1972,29 @@ public final class CraftServer implements Server {
+@@ -1979,6 +1979,29 @@ public final class CraftServer implements Server {
          return new CraftChunkData(world);
      }
  

work/Bukkit

@@ -1 +1 @@
-Subproject commit aff39bc0dcacde5ed226f3423df00948466cf74b
+Subproject commit f1e73b038b29211b199ff9b13bca576daeb660b2

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 6b95d595cf8d406a7cff77c3784fc8c3a2788376
+Subproject commit 8b831a965200a2ba7d1c01d720e265565ae9f4d4