diff --git a/Spigot-API-Patches/0004-Timings-v2.patch b/Spigot-API-Patches/0004-Timings-v2.patch
index 24036d368f..e7c82b394c 100644
--- a/Spigot-API-Patches/0004-Timings-v2.patch
+++ b/Spigot-API-Patches/0004-Timings-v2.patch
@@ -2780,10 +2780,10 @@ index 0000000000000000000000000000000000000000..5989ee21297935651b0edd44b8239e65
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 2e059809021ea639c27d8a202a2962de1dae8168..f1585968b13007b0f9b8c69ac3c2eff28a0fc89e 100644
+index 7168dd083ee30a47b104ab32cabb3215815f7470..7c715fdc11ab7837552b1fe3ffd08b31cec0a63b 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 {
+@@ -649,7 +649,6 @@ public final class Bukkit {
       */
      public static void reload() {
          server.reload();
@@ -2792,10 +2792,10 @@ index 2e059809021ea639c27d8a202a2962de1dae8168..f1585968b13007b0f9b8c69ac3c2eff2
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e43ba4c97b4a61e2b49c58553c39d0757521418d..6cbc22c08ce421bcd8bf3efabc96c9cec447faee 100644
+index 4ba8572f1beb3b9ad46620946eb4ee89ac91818e..a6b9e4f158583e5932bf8ca210d531857e9f5360 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1337,6 +1337,26 @@ public interface Server extends PluginMessageRecipient {
+@@ -1344,6 +1344,26 @@ public interface Server extends PluginMessageRecipient {
              throw new UnsupportedOperationException("Not supported yet.");
          }
  
diff --git a/Spigot-API-Patches/0006-Add-getTPS-method.patch b/Spigot-API-Patches/0006-Add-getTPS-method.patch
index a87c28342d..198205c41f 100644
--- a/Spigot-API-Patches/0006-Add-getTPS-method.patch
+++ b/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 f1585968b13007b0f9b8c69ac3c2eff28a0fc89e..59f0ba664dd945f24eaf9e38e98fdef0c4aaaa92 100644
+index 7c715fdc11ab7837552b1fe3ffd08b31cec0a63b..984bec345cbb8038d8756f5ab5553143f04a5044 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1412,6 +1412,17 @@ public final class Bukkit {
+@@ -1421,6 +1421,17 @@ public final class Bukkit {
          return server.getEntity(uuid);
      }
  
@@ -27,10 +27,10 @@ index f1585968b13007b0f9b8c69ac3c2eff28a0fc89e..59f0ba664dd945f24eaf9e38e98fdef0
       * 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 6cbc22c08ce421bcd8bf3efabc96c9cec447faee..5cf43d538eee6eff031a93ab28f8f33c661acee3 100644
+index a6b9e4f158583e5932bf8ca210d531857e9f5360..0be1d5d5fa5a6d687820d767e501a54f93fd72b4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1185,6 +1185,16 @@ public interface Server extends PluginMessageRecipient {
+@@ -1192,6 +1192,16 @@ public interface Server extends PluginMessageRecipient {
      @Nullable
      Entity getEntity(@NotNull UUID uuid);
  
diff --git a/Spigot-API-Patches/0014-Expose-server-CommandMap.patch b/Spigot-API-Patches/0014-Expose-server-CommandMap.patch
index 1f42ac19a8..42a5375288 100644
--- a/Spigot-API-Patches/0014-Expose-server-CommandMap.patch
+++ b/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 59f0ba664dd945f24eaf9e38e98fdef0c4aaaa92..9433934d52e637ca340934350b43d4c827ee9606 100644
+index 984bec345cbb8038d8756f5ab5553143f04a5044..4747afa841b4fa71328c480f836f9fefb2e0c118 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1586,6 +1586,19 @@ public final class Bukkit {
+@@ -1595,6 +1595,19 @@ public final class Bukkit {
          return server.getUnsafe();
      }
  
@@ -29,10 +29,10 @@ index 59f0ba664dd945f24eaf9e38e98fdef0c4aaaa92..9433934d52e637ca340934350b43d4c8
      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 5cf43d538eee6eff031a93ab28f8f33c661acee3..620a16eaa74a31711b8598a70c9e9ed0f361ceb8 100644
+index 0be1d5d5fa5a6d687820d767e501a54f93fd72b4..1f8095141bdbfabb1e487d93f33f636e83084386 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1195,6 +1195,15 @@ public interface Server extends PluginMessageRecipient {
+@@ -1202,6 +1202,15 @@ public interface Server extends PluginMessageRecipient {
      public double[] getTPS();
      // Paper end
  
diff --git a/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
index ff1f7afbcf..ed62aa3983 100644
--- a/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
+++ b/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
 Change Javadoc to be accurate
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 9433934d52e637ca340934350b43d4c827ee9606..071e27179e44e2a3a33b9c4fb900378c5fd9c34f 100644
+index 4747afa841b4fa71328c480f836f9fefb2e0c118..dcb3af5a6d4fedcb805928223e40c74fbea894a0 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -274,6 +274,26 @@ public final class Bukkit {
+@@ -283,6 +283,26 @@ public final class Bukkit {
          return server.broadcastMessage(message);
      }
  
@@ -37,10 +37,10 @@ index 9433934d52e637ca340934350b43d4c827ee9606..071e27179e44e2a3a33b9c4fb900378c
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 620a16eaa74a31711b8598a70c9e9ed0f361ceb8..2387c04e8a4d14f04e7e4d09f7120d48a98703aa 100644
+index 1f8095141bdbfabb1e487d93f33f636e83084386..00738355e42704de583b60833d4fb39a8728e762 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -225,6 +225,26 @@ public interface Server extends PluginMessageRecipient {
+@@ -232,6 +232,26 @@ public interface Server extends PluginMessageRecipient {
       */
      public int broadcastMessage(@NotNull String message);
  
diff --git a/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch b/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch
index 8b49343764..ecf212c902 100644
--- a/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch
+++ b/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 071e27179e44e2a3a33b9c4fb900378c5fd9c34f..c10165f9fc2317a29c3bef7fa0dc0e308f64b7aa 100644
+index dcb3af5a6d4fedcb805928223e40c74fbea894a0..ffa6be2424774960e36288d02f06d591e30d49d0 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1617,6 +1617,13 @@ public final class Bukkit {
+@@ -1626,6 +1626,13 @@ public final class Bukkit {
      public static org.bukkit.command.CommandMap getCommandMap() {
          return server.getCommandMap();
      }
@@ -24,10 +24,10 @@ index 071e27179e44e2a3a33b9c4fb900378c5fd9c34f..c10165f9fc2317a29c3bef7fa0dc0e30
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 2387c04e8a4d14f04e7e4d09f7120d48a98703aa..c0fd1543a902cf4ff28207b5786af69fbe94a468 100644
+index 00738355e42704de583b60833d4fb39a8728e762..7b2eb7b8a77a4ca8ae6e4e8c66597f83627bd199 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1425,4 +1425,6 @@ public interface Server extends PluginMessageRecipient {
+@@ -1432,4 +1432,6 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      Spigot spigot();
      // Spigot end
diff --git a/Spigot-API-Patches/0038-Allow-Reloading-of-Command-Aliases.patch b/Spigot-API-Patches/0038-Allow-Reloading-of-Command-Aliases.patch
index 050854600b..2f0f0b848f 100644
--- a/Spigot-API-Patches/0038-Allow-Reloading-of-Command-Aliases.patch
+++ b/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 c10165f9fc2317a29c3bef7fa0dc0e308f64b7aa..dbf14b0953c254a677ad134e524607b2a057f36e 100644
+index ffa6be2424774960e36288d02f06d591e30d49d0..84ac91aa533f9c3e5c1e9107404fda5ec519ca02 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1624,6 +1624,15 @@ public final class Bukkit {
+@@ -1633,6 +1633,15 @@ public final class Bukkit {
      public static void reloadPermissions() {
          server.reloadPermissions();
      }
@@ -26,10 +26,10 @@ index c10165f9fc2317a29c3bef7fa0dc0e308f64b7aa..dbf14b0953c254a677ad134e524607b2
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c0fd1543a902cf4ff28207b5786af69fbe94a468..9e90a69ad2231c4d2d4c778b9a3095e908f22f1e 100644
+index 7b2eb7b8a77a4ca8ae6e4e8c66597f83627bd199..75800dc49b66c240da92430f1defc9f63966e0b6 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1427,4 +1427,6 @@ public interface Server extends PluginMessageRecipient {
+@@ -1434,4 +1434,6 @@ public interface Server extends PluginMessageRecipient {
      // Spigot end
  
      void reloadPermissions(); // Paper
diff --git a/Spigot-API-Patches/0049-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-API-Patches/0049-Add-configuration-option-to-prevent-player-names-fro.patch
index ae9f04f331..81f833af14 100644
--- a/Spigot-API-Patches/0049-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/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 dbf14b0953c254a677ad134e524607b2a057f36e..016efcee2abefb3e92c59527e8762ee51956bc81 100644
+index 84ac91aa533f9c3e5c1e9107404fda5ec519ca02..777352a820b21bc013b671b62f89ae4c6418e3cb 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1633,6 +1633,16 @@ public final class Bukkit {
+@@ -1642,6 +1642,16 @@ public final class Bukkit {
      public static boolean reloadCommandAliases() {
          return server.reloadCommandAliases();
      }
@@ -27,10 +27,10 @@ index dbf14b0953c254a677ad134e524607b2a057f36e..016efcee2abefb3e92c59527e8762ee5
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 9e90a69ad2231c4d2d4c778b9a3095e908f22f1e..843b3f949d60cd78df830208bf98a93346f8d754 100644
+index 75800dc49b66c240da92430f1defc9f63966e0b6..02c1d054744cb0564c6593938af278e6388adfb4 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1429,4 +1429,14 @@ public interface Server extends PluginMessageRecipient {
+@@ -1436,4 +1436,14 @@ public interface Server extends PluginMessageRecipient {
      void reloadPermissions(); // Paper
  
      boolean reloadCommandAliases(); // Paper
diff --git a/Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch b/Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch
index 1e0c4ba1cc..f8607d60ba 100644
--- a/Spigot-API-Patches/0055-Basic-PlayerProfile-API.patch
+++ b/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 016efcee2abefb3e92c59527e8762ee51956bc81..039c44654621c434a8cc1fa4a2dc46ede793054a 100644
+index 777352a820b21bc013b671b62f89ae4c6418e3cb..c7019397923f9f9349bb5fdd15455f2dbf99bfd5 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1643,6 +1643,40 @@ public final class Bukkit {
+@@ -1652,6 +1652,40 @@ public final class Bukkit {
      public static boolean suggestPlayerNamesWhenNullTabCompletions() {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
@@ -312,10 +312,10 @@ index 016efcee2abefb3e92c59527e8762ee51956bc81..039c44654621c434a8cc1fa4a2dc46ed
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 843b3f949d60cd78df830208bf98a93346f8d754..5582e377bb2a85b94d0c9c2a90d5b488991af098 100644
+index 02c1d054744cb0564c6593938af278e6388adfb4..66d0a3c6de2ea3c0a2fe3cd160a52f0cabe58ef3 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1438,5 +1438,33 @@ public interface Server extends PluginMessageRecipient {
+@@ -1445,5 +1445,33 @@ public interface Server extends PluginMessageRecipient {
       * @return true if player names should be suggested
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();
diff --git a/Spigot-API-Patches/0088-getPlayerUniqueId-API.patch b/Spigot-API-Patches/0088-getPlayerUniqueId-API.patch
index 65d3d31e18..1728e5f09a 100644
--- a/Spigot-API-Patches/0088-getPlayerUniqueId-API.patch
+++ b/Spigot-API-Patches/0088-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/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 039c44654621c434a8cc1fa4a2dc46ede793054a..97ed7d9f6415219db4d6b0054dc3d2afeb1ce6e5 100644
+index c7019397923f9f9349bb5fdd15455f2dbf99bfd5..9ea3d8695dbfbfffb02919531a86b713cade7bec 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -489,6 +489,20 @@ public final class Bukkit {
+@@ -498,6 +498,20 @@ public final class Bukkit {
          return server.getPlayer(id);
      }
  
@@ -34,10 +34,10 @@ index 039c44654621c434a8cc1fa4a2dc46ede793054a..97ed7d9f6415219db4d6b0054dc3d2af
       * Gets the plugin manager for interfacing with plugins.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 5582e377bb2a85b94d0c9c2a90d5b488991af098..da9c85372605ab0d68f21bb38885eb0f4dfebded 100644
+index 66d0a3c6de2ea3c0a2fe3cd160a52f0cabe58ef3..89deb6890e008832df06c4b6392ffb32d88a9c2d 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -416,6 +416,18 @@ public interface Server extends PluginMessageRecipient {
+@@ -423,6 +423,18 @@ public interface Server extends PluginMessageRecipient {
      @Nullable
      public Player getPlayer(@NotNull UUID id);
  
diff --git a/Spigot-API-Patches/0161-Make-the-default-permission-message-configurable.patch b/Spigot-API-Patches/0161-Make-the-default-permission-message-configurable.patch
index a1377afd1a..b096e44dfa 100644
--- a/Spigot-API-Patches/0161-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-API-Patches/0161-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 97ed7d9f6415219db4d6b0054dc3d2afeb1ce6e5..c6834080859051bdd0f33f2c9e9a8e48d7dbd31b 100644
+index 9ea3d8695dbfbfffb02919531a86b713cade7bec..91fe826435978591d0852986dedfbf6885f5588c 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1658,6 +1658,15 @@ public final class Bukkit {
+@@ -1667,6 +1667,15 @@ public final class Bukkit {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
  
@@ -25,10 +25,10 @@ index 97ed7d9f6415219db4d6b0054dc3d2afeb1ce6e5..c6834080859051bdd0f33f2c9e9a8e48
       * 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 da9c85372605ab0d68f21bb38885eb0f4dfebded..47e6a3f2bd41a9a01ec74e4c3f4919098ba88614 100644
+index 89deb6890e008832df06c4b6392ffb32d88a9c2d..836f94398cdd08003c58eee8ade53c5634da5be9 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1451,6 +1451,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1458,6 +1458,13 @@ public interface Server extends PluginMessageRecipient {
       */
      boolean suggestPlayerNamesWhenNullTabCompletions();
  
diff --git a/Spigot-API-Patches/0175-Flip-some-Spigot-API-null-annotations.patch b/Spigot-API-Patches/0175-Flip-some-Spigot-API-null-annotations.patch
index f2306f805f..a4708c756d 100644
--- a/Spigot-API-Patches/0175-Flip-some-Spigot-API-null-annotations.patch
+++ b/Spigot-API-Patches/0175-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 c6834080859051bdd0f33f2c9e9a8e48d7dbd31b..6b3af64ecd0b96b995f54389b15fc995f2cf78f1 100644
+index 91fe826435978591d0852986dedfbf6885f5588c..3025bd30bc345dd8c895aab012280f11e1d46fc8 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1254,7 +1254,7 @@ public final class Bukkit {
+@@ -1263,7 +1263,7 @@ public final class Bukkit {
       *
       * @return the scoreboard manager or null if no worlds are loaded.
       */
@@ -21,7 +21,7 @@ index c6834080859051bdd0f33f2c9e9a8e48d7dbd31b..6b3af64ecd0b96b995f54389b15fc995
      public static ScoreboardManager getScoreboardManager() {
          return server.getScoreboardManager();
      }
-@@ -1551,7 +1551,7 @@ public final class Bukkit {
+@@ -1560,7 +1560,7 @@ public final class Bukkit {
       * @param clazz the class of the tag entries
       * @return the tag or null
       */
@@ -62,10 +62,10 @@ index 9c91c49ed7302c12fcb1d8e9bc58712efc199954..d5d67b3d84cd88ed0f858497e68535ec
          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 47e6a3f2bd41a9a01ec74e4c3f4919098ba88614..670c02976500fa2953f05027ec7c895b75fe7225 100644
+index 836f94398cdd08003c58eee8ade53c5634da5be9..f1e3246b42794577272fb9ddb70ca62664f02d1d 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1051,7 +1051,7 @@ public interface Server extends PluginMessageRecipient {
+@@ -1058,7 +1058,7 @@ public interface Server extends PluginMessageRecipient {
       *
       * @return the scoreboard manager or null if no worlds are loaded.
       */
@@ -74,7 +74,7 @@ index 47e6a3f2bd41a9a01ec74e4c3f4919098ba88614..670c02976500fa2953f05027ec7c895b
      ScoreboardManager getScoreboardManager();
  
      /**
-@@ -1321,7 +1321,7 @@ public interface Server extends PluginMessageRecipient {
+@@ -1328,7 +1328,7 @@ public interface Server extends PluginMessageRecipient {
       * @param clazz the class of the tag entries
       * @return the tag or null
       */
diff --git a/Spigot-API-Patches/0184-Expose-the-internal-current-tick.patch b/Spigot-API-Patches/0184-Expose-the-internal-current-tick.patch
index a8a2dcc863..dec53c7e2e 100644
--- a/Spigot-API-Patches/0184-Expose-the-internal-current-tick.patch
+++ b/Spigot-API-Patches/0184-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 6b3af64ecd0b96b995f54389b15fc995f2cf78f1..018a8c871f3afdd8b6e1b156b2113f62e330e3d3 100644
+index 3025bd30bc345dd8c895aab012280f11e1d46fc8..683c9dc0f183cdee8dd909835c0cb0fe9b033075 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1700,6 +1700,10 @@ public final class Bukkit {
+@@ -1709,6 +1709,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 6b3af64ecd0b96b995f54389b15fc995f2cf78f1..018a8c871f3afdd8b6e1b156b2113f62
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 670c02976500fa2953f05027ec7c895b75fe7225..93337d6eaf27999043ae09e7240689e7c4e78ace 100644
+index f1e3246b42794577272fb9ddb70ca62664f02d1d..af9f834f468cefbb72f798d63b9eb7b10811ed9f 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1485,5 +1485,12 @@ public interface Server extends PluginMessageRecipient {
+@@ -1492,5 +1492,12 @@ public interface Server extends PluginMessageRecipient {
       */
      @NotNull
      com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nullable UUID uuid, @Nullable String name);
diff --git a/Spigot-API-Patches/0190-Add-tick-times-API.patch b/Spigot-API-Patches/0190-Add-tick-times-API.patch
index 92fa5fb431..41d7e58132 100644
--- a/Spigot-API-Patches/0190-Add-tick-times-API.patch
+++ b/Spigot-API-Patches/0190-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 018a8c871f3afdd8b6e1b156b2113f62e330e3d3..1b9f18b3a48e5f31b1cecbf7ab40c86fef4f44bd 100644
+index 683c9dc0f183cdee8dd909835c0cb0fe9b033075..2d73a06dc6b6a5163696750cb563d52e327ab4d1 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1455,6 +1455,25 @@ public final class Bukkit {
+@@ -1464,6 +1464,25 @@ public final class Bukkit {
      public static double[] getTPS() {
          return server.getTPS();
      }
@@ -35,10 +35,10 @@ index 018a8c871f3afdd8b6e1b156b2113f62e330e3d3..1b9f18b3a48e5f31b1cecbf7ab40c86f
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 93337d6eaf27999043ae09e7240689e7c4e78ace..a07c848039e8a36e07d5362bda499f113bb61f1e 100644
+index af9f834f468cefbb72f798d63b9eb7b10811ed9f..a15e672be066cef7828a8e0c5b09209d8c268181 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1225,6 +1225,21 @@ public interface Server extends PluginMessageRecipient {
+@@ -1232,6 +1232,21 @@ public interface Server extends PluginMessageRecipient {
       */
      @NotNull
      public double[] getTPS();
diff --git a/Spigot-API-Patches/0191-Expose-MinecraftServer-isRunning.patch b/Spigot-API-Patches/0191-Expose-MinecraftServer-isRunning.patch
index 26bfdfc461..188d9830af 100644
--- a/Spigot-API-Patches/0191-Expose-MinecraftServer-isRunning.patch
+++ b/Spigot-API-Patches/0191-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 1b9f18b3a48e5f31b1cecbf7ab40c86fef4f44bd..b7d260fd7d1a869fb0d04e29012d540f49d9b82a 100644
+index 2d73a06dc6b6a5163696750cb563d52e327ab4d1..6a8e8b039e0c6473a540824ae1f22b1ab321d6ca 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1723,6 +1723,15 @@ public final class Bukkit {
+@@ -1732,6 +1732,15 @@ public final class Bukkit {
      public static int getCurrentTick() {
          return server.getCurrentTick();
      }
@@ -26,10 +26,10 @@ index 1b9f18b3a48e5f31b1cecbf7ab40c86fef4f44bd..b7d260fd7d1a869fb0d04e29012d540f
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index a07c848039e8a36e07d5362bda499f113bb61f1e..2dfecdd73f911f657ee30c4848c903c522d97bcb 100644
+index a15e672be066cef7828a8e0c5b09209d8c268181..0269120a74d6368647ef3ad84d8c55640d38c152 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1507,5 +1507,12 @@ public interface Server extends PluginMessageRecipient {
+@@ -1514,5 +1514,12 @@ public interface Server extends PluginMessageRecipient {
       * @return Current tick
       */
      int getCurrentTick();
diff --git a/Spigot-API-Patches/0200-Add-Mob-Goal-API.patch b/Spigot-API-Patches/0200-Add-Mob-Goal-API.patch
index 51e88caa96..21c15829e7 100644
--- a/Spigot-API-Patches/0200-Add-Mob-Goal-API.patch
+++ b/Spigot-API-Patches/0200-Add-Mob-Goal-API.patch
@@ -441,10 +441,10 @@ index 0000000000000000000000000000000000000000..b42091752981a1f309ab350e9a394092
 +    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 c020912df1625da34a9f29ee2ea74835e9ae1e79..2d981b2481dfb428b2f6a27b5649b7e6148a8776 100644
+index 31b2150a7c3c93aa2581a85095a60e17aa469ea6..263be0e9c6366da2e8c6371968a70171ac59c3f8 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1744,6 +1744,16 @@ public final class Bukkit {
+@@ -1753,6 +1753,16 @@ public final class Bukkit {
      public static boolean isStopping() {
          return server.isStopping();
      }
@@ -462,10 +462,10 @@ index c020912df1625da34a9f29ee2ea74835e9ae1e79..2d981b2481dfb428b2f6a27b5649b7e6
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 13bf8dcc23986ad4f3761d9b395d278df7caa958..bad2ae145ca8fd1e7eb07f0507a743c4ffd23030 100644
+index 7daad551f79a5d4d1ba4e63708fd59843fde7c2e..8feb99cddbab6d63c34f50828f1b7799b50bd373 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1524,5 +1524,13 @@ public interface Server extends PluginMessageRecipient {
+@@ -1531,5 +1531,13 @@ public interface Server extends PluginMessageRecipient {
       * @return true if server is in the process of being shutdown
       */
      boolean isStopping();
diff --git a/Spigot-API-Patches/0215-Allow-delegation-to-vanilla-chunk-gen.patch b/Spigot-API-Patches/0215-Allow-delegation-to-vanilla-chunk-gen.patch
index 77dc33a6a1..48c3fd88b2 100644
--- a/Spigot-API-Patches/0215-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/Spigot-API-Patches/0215-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 2d981b2481dfb428b2f6a27b5649b7e6148a8776..62cc1c74c11f56dcbd1e24e9c5478497742e6351 100644
+index 263be0e9c6366da2e8c6371968a70171ac59c3f8..e340ef507d5a2b6b14114d0f061679c1a90884d4 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1355,6 +1355,22 @@ public final class Bukkit {
+@@ -1364,6 +1364,22 @@ public final class Bukkit {
          return server.createChunkData(world);
      }
  
@@ -32,10 +32,10 @@ index 2d981b2481dfb428b2f6a27b5649b7e6148a8776..62cc1c74c11f56dcbd1e24e9c5478497
       * 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 bad2ae145ca8fd1e7eb07f0507a743c4ffd23030..6e01bf2d52e8bb6de7395f50c12f16c64aef72ae 100644
+index 8feb99cddbab6d63c34f50828f1b7799b50bd373..73537af41d010283221418084c244261f262ceab 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1136,6 +1136,20 @@ public interface Server extends PluginMessageRecipient {
+@@ -1143,6 +1143,20 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      public ChunkGenerator.ChunkData createChunkData(@NotNull World world);
  
diff --git a/Spigot-API-Patches/0231-Add-getOfflinePlayerIfCached-String.patch b/Spigot-API-Patches/0231-Add-getOfflinePlayerIfCached-String.patch
index 4880dcb94d..5a3f179ab0 100644
--- a/Spigot-API-Patches/0231-Add-getOfflinePlayerIfCached-String.patch
+++ b/Spigot-API-Patches/0231-Add-getOfflinePlayerIfCached-String.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index bfe842364ee0a4bf39dacdbb6972477d57a4ef8a..464b2161f42a9a3969336820bc793274f4d6e942 100644
+index 9ec0608a79bc9cf3a992f9e549fd471e10e6bb5e..fecd7b14d317f55eb1ce7b5c6af9913917971427 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -919,6 +919,27 @@ public final class Bukkit {
+@@ -928,6 +928,27 @@ public final class Bukkit {
          return server.getOfflinePlayer(name);
      }
  
@@ -37,10 +37,10 @@ index bfe842364ee0a4bf39dacdbb6972477d57a4ef8a..464b2161f42a9a3969336820bc793274
       * Gets the player by the given UUID, regardless if they are offline or
       * online.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 7c0a788900c93c29d14d8c45ac5ae3317cf4a94e..3e6331807f2c411cef3c2774a503f162685e8b46 100644
+index 69070e472518fba66581e6050d3308d46c1d1608..8e01e1bbb7cfd98b47dbdb3a0e132dafd1413de6 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -770,6 +770,25 @@ public interface Server extends PluginMessageRecipient {
+@@ -777,6 +777,25 @@ public interface Server extends PluginMessageRecipient {
      @NotNull
      public OfflinePlayer getOfflinePlayer(@NotNull String name);
  
diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch
index bc36ebf0c0..3c482dd27e 100644
--- a/Spigot-Server-Patches/0002-Paper-config-files.patch
+++ b/Spigot-Server-Patches/0002-Paper-config-files.patch
@@ -655,10 +655,10 @@ index 169822482d3e31ef4f625a82102adc6d478588a8..2ffa56f3580b524c3593505585410dc3
          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 0986d666b777b9992f8cbbffef964717cabe91df..159c0c671833a8973b543fd83d8b6b3394b35dc0 100644
+index 3aac98dd08e1608c30254fbcf6982773a3a6d20f..bf21a80f781e600a08f82d1a16f0e11983dc8f8d 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 {
+@@ -809,6 +809,7 @@ public final class CraftServer implements Server {
          }
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
@@ -666,7 +666,7 @@ index 0986d666b777b9992f8cbbffef964717cabe91df..159c0c671833a8973b543fd83d8b6b33
          for (WorldServer world : console.getWorlds()) {
              world.worldDataServer.setDifficulty(config.difficulty);
              world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
-@@ -837,6 +838,7 @@ public final class CraftServer implements Server {
+@@ -842,6 +843,7 @@ public final class CraftServer implements Server {
                  world.ticksPerAmbientSpawns = this.getTicksPerAmbientSpawns();
              }
              world.spigotConfig.init(); // Spigot
@@ -674,7 +674,7 @@ index 0986d666b777b9992f8cbbffef964717cabe91df..159c0c671833a8973b543fd83d8b6b33
          }
  
          pluginManager.clearPlugins();
-@@ -844,6 +846,7 @@ public final class CraftServer implements Server {
+@@ -849,6 +851,7 @@ public final class CraftServer implements Server {
          resetRecipes();
          reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
@@ -682,7 +682,7 @@ index 0986d666b777b9992f8cbbffef964717cabe91df..159c0c671833a8973b543fd83d8b6b33
          overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
          ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2091,4 +2094,35 @@ public final class CraftServer implements Server {
+@@ -2096,4 +2099,35 @@ public final class CraftServer implements Server {
      {
          return spigot;
      }
@@ -719,7 +719,7 @@ index 0986d666b777b9992f8cbbffef964717cabe91df..159c0c671833a8973b543fd83d8b6b33
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 9c98589c2db92720b4ae054ee74ef7ab0dac891a..f187c7d127c356861c30141efeafcef0057878ec 100644
+index 3f52c19b6b797e26b3dcedcec2afd28c478e7091..3a6578170765a472d36b169b999e9dc57bf8070b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -129,6 +129,14 @@ public class Main {
diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch
index 04b5177019..96a9f787ea 100644
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@@ -735,7 +735,7 @@ index 871b79cb2c63525c430c257f00b2cf70157aa476..d847326b0099a0c05a085d5d62de6304
      private String name;
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 18e18e6cabe94a23ebfc9f9d8279837105f1d976..30d760ab30ed70ec2e4c37f2e8dbe80006c51f1b 100644
+index 23b89ef64deddd3e0db21829aad5a2da1e427be1..0014bf4f47375ebe4ef17110e8f02a315a9dcb43 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -696,6 +696,7 @@ public class Chunk implements IChunkAccess {
@@ -1807,10 +1807,10 @@ index c54f297e89939fa27c7c39ff6d0110aba537e6ce..da01aac42b32af6831a69f49e43d77fd
  
          // 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 159c0c671833a8973b543fd83d8b6b3394b35dc0..90551257c299aaf694eb4f4063d5b1b3eee94876 100644
+index bf21a80f781e600a08f82d1a16f0e11983dc8f8d..73bd46c980cb13d6cbe4aba41adb122eaab769be 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2064,12 +2064,31 @@ public final class CraftServer implements Server {
+@@ -2069,12 +2069,31 @@ public final class CraftServer implements Server {
      private final Spigot spigot = new Spigot()
      {
  
@@ -2012,7 +2012,7 @@ index 7f435847ac1d13756ce233e7d5ae13f9dc17c443..00000000000000000000000000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a1faa13cbf11c084ed146c86e4fac111e01fdd4a..04043d3c317fb7fa7b5b03ac5af874f6ffd775a5 100644
+index 3551ab3a570042585621c943d74d8d3c0bd299b4..4001145980f4dabbd291336d5a464c3856144996 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1821,6 +1821,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
diff --git a/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch
index 01f5618be2..c89c303924 100644
--- a/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch
+++ b/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch
@@ -140,10 +140,10 @@ index 42942635c69752fe2f5091759f07ed4a892f7b74..775306d7e59ff135004e54d2d055bd05
                      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 ac177cd391e220af7584463e35f1f11e0393cde8..d815d1078249f5c849d501835b2d747c52f20af6 100644
+index 59ebde67a89b26c537d77bf2004a61316be715a5..9c81c1785ef1b25bc17c91f4de045b2b0141c1ad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2061,6 +2061,17 @@ public final class CraftServer implements Server {
+@@ -2066,6 +2066,17 @@ public final class CraftServer implements Server {
          return CraftMagicNumbers.INSTANCE;
      }
  
diff --git a/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch
index 6919f7f0b2..0bc1b28d74 100644
--- a/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch
@@ -48,10 +48,10 @@ index d34e91887cd73009bf852fb849e495a8affed7a9..c70e290405c7c5ba247c1d3cce286579
          } 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 d815d1078249f5c849d501835b2d747c52f20af6..b653e94497c2c3da0b1ba343acb56039b95b89b4 100644
+index 9c81c1785ef1b25bc17c91f4de045b2b0141c1ad..bd9097314ee0e570f3b62ba94e6d68cf2fae6221 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -755,6 +755,29 @@ public final class CraftServer implements Server {
+@@ -760,6 +760,29 @@ public final class CraftServer implements Server {
          Validate.notNull(commandLine, "CommandLine cannot be null");
          org.spigotmc.AsyncCatcher.catchOp("command dispatch"); // Spigot
  
diff --git a/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch
index 13e0878a8f..ff3b834a08 100644
--- a/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch
+++ b/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 b653e94497c2c3da0b1ba343acb56039b95b89b4..b5e1ae8efb7165547e228d2c9d6d84a72b772df5 100644
+index bd9097314ee0e570f3b62ba94e6d68cf2fae6221..6d410521707c88abbf1b9d2054bb16d3b1aa2394 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1706,6 +1706,7 @@ public final class CraftServer implements Server {
+@@ -1711,6 +1711,7 @@ public final class CraftServer implements Server {
          return helpMap;
      }
  
diff --git a/Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch
index 989f1313ec..96e191652a 100644
--- a/Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch
+++ b/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 c59e2a2cdc1accd8d7fb119bee954eb68380e4f7..0ecda8be9781d98253a5b9a97e7d76be118866c4 100644
+index 4981acf892146caf79146293e41b131a1803ac15..41f312059cec379adf2afc9358a81d89ced74cc4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2180,5 +2180,23 @@ public final class CraftServer implements Server {
+@@ -2185,5 +2185,23 @@ public final class CraftServer implements Server {
              return null;
          }
      }
diff --git a/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch
index b4d125efb4..8a5fda0506 100644
--- a/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch
+++ b/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 0ecda8be9781d98253a5b9a97e7d76be118866c4..2acea7f374d21a906abce274816ad8d7cc9b9a34 100644
+index 41f312059cec379adf2afc9358a81d89ced74cc4..7779b0784c62cf74ea3ea0865f76ea70ccaf35d8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -866,8 +866,18 @@ public final class CraftServer implements Server {
+@@ -871,8 +871,18 @@ public final class CraftServer implements Server {
              world.paperConfig.init(); // Paper
          }
  
diff --git a/Spigot-Server-Patches/0073-Configurable-Chunk-Inhabited-Time.patch b/Spigot-Server-Patches/0073-Configurable-Chunk-Inhabited-Time.patch
index ba216985b7..b6fadbf85e 100644
--- a/Spigot-Server-Patches/0073-Configurable-Chunk-Inhabited-Time.patch
+++ b/Spigot-Server-Patches/0073-Configurable-Chunk-Inhabited-Time.patch
@@ -30,10 +30,10 @@ index 6998ec2d7550094498649deb9028988700982e04..6babdde2910162a03b8abbcbb7db1f78
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 560d61183f28b0271739548e8b784fdaf97e8a11..f02d4726747a0992e851730c21c9423f706aa27a 100644
+index 7607b0e195611488f3007e91e63f6e30fb636213..bc8eb90c154a3c95f38e275058b620f4c433ac9b 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -980,7 +980,7 @@ public class Chunk implements IChunkAccess {
+@@ -983,7 +983,7 @@ public class Chunk implements IChunkAccess {
  
      @Override
      public long getInhabitedTime() {
diff --git a/Spigot-Server-Patches/0107-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0107-Add-setting-for-proxy-online-mode-status.patch
index a4fb483e5d..d6f0632895 100644
--- a/Spigot-Server-Patches/0107-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0107-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 2acea7f374d21a906abce274816ad8d7cc9b9a34..c3c21623c8168f5e929cd31e66116232d3e0f0c1 100644
+index 7779b0784c62cf74ea3ea0865f76ea70ccaf35d8..f2e641c80323b041241956c29590478ff2cf18ef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1484,7 +1484,8 @@ public final class CraftServer implements Server {
+@@ -1489,7 +1489,8 @@ public final class CraftServer implements Server {
              // Spigot Start
              GameProfile profile = null;
              // Only fetch an online UUID in online mode
diff --git a/Spigot-Server-Patches/0119-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0119-Allow-Reloading-of-Command-Aliases.patch
index c6ef1ad384..2b0dc54b29 100644
--- a/Spigot-Server-Patches/0119-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0119-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 c3c21623c8168f5e929cd31e66116232d3e0f0c1..bf86a4cd46db0961d4dbe19be0a799dabf6212a2 100644
+index f2e641c80323b041241956c29590478ff2cf18ef..05f87da2680a23746e023e52368d55748ecfc059 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2209,5 +2209,24 @@ public final class CraftServer implements Server {
+@@ -2214,5 +2214,24 @@ public final class CraftServer implements Server {
          DefaultPermissions.registerCorePermissions();
          CraftDefaultPermissions.registerCorePermissions();
      }
diff --git a/Spigot-Server-Patches/0144-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0144-Add-configuration-option-to-prevent-player-names-fro.patch
index 24a26d6b50..2f01669537 100644
--- a/Spigot-Server-Patches/0144-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-Server-Patches/0144-Add-configuration-option-to-prevent-player-names-fro.patch
@@ -20,10 +20,10 @@ index c74c653e1417b052d498b38c30d94214812d5778..fcf8aef72aa117c26d1780ae85704e23
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bf86a4cd46db0961d4dbe19be0a799dabf6212a2..b54d24096bba7afd33b45cf22dfcdafcfa31eb3d 100644
+index 05f87da2680a23746e023e52368d55748ecfc059..60d5de863b3abf364e0895d1b83c836b75e1e2be 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2228,5 +2228,10 @@ public final class CraftServer implements Server {
+@@ -2233,5 +2233,10 @@ public final class CraftServer implements Server {
          commandMap.registerServerAliases();
          return true;
      }
diff --git a/Spigot-Server-Patches/0145-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0145-Use-TerminalConsoleAppender-for-console-improvements.patch
index 3a9af1ced9..b670a235c5 100644
--- a/Spigot-Server-Patches/0145-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0145-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -259,7 +259,7 @@ index e42a789f24215f192427218fa08ae327f09c2a46..6b12c1d96a2b0ea305425a563dd0e908
  
          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 b54d24096bba7afd33b45cf22dfcdafcfa31eb3d..2eb2c0c93b0d67ad7474e37158dab44018c9cbac 100644
+index 60d5de863b3abf364e0895d1b83c836b75e1e2be..921434d9adf0b2c55c1194a3f258ffadb91c1eb8 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 b54d24096bba7afd33b45cf22dfcdafcfa31eb3d..2eb2c0c93b0d67ad7474e37158dab440
  import net.minecraft.server.Advancement;
  import net.minecraft.server.ArgumentEntity;
  import net.minecraft.server.BiomeManager;
-@@ -1194,9 +1194,13 @@ public final class CraftServer implements Server {
+@@ -1199,9 +1199,13 @@ public final class CraftServer implements Server {
          return logger;
      }
  
@@ -286,7 +286,7 @@ index b54d24096bba7afd33b45cf22dfcdafcfa31eb3d..2eb2c0c93b0d67ad7474e37158dab440
      @Override
      public PluginCommand getPluginCommand(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 868a67c5023e61960d6225de8ad1506c46177733..eae93b314fed9f7ddf1c0b87228a2f3bc9f73a78 100644
+index 78b6d00ea40e8d7c450e08e444c5231e7c99969b..78fad8d06540a0cf41302f12bf25e08e49f589d9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -12,7 +12,7 @@ import java.util.logging.Level;
diff --git a/Spigot-Server-Patches/0150-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0150-Add-UnknownCommandEvent.patch
index 3c8c442f5e..b112baff2a 100644
--- a/Spigot-Server-Patches/0150-Add-UnknownCommandEvent.patch
+++ b/Spigot-Server-Patches/0150-Add-UnknownCommandEvent.patch
@@ -5,7 +5,7 @@ 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 2eb2c0c93b0d67ad7474e37158dab44018c9cbac..3e3f2a3d3b5ab32f498b4dd65f35f4c26470790f 100644
+index 921434d9adf0b2c55c1194a3f258ffadb91c1eb8..419982244c8f5c9de69eb44ee27d23300132d859 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -105,6 +105,7 @@ import net.minecraft.server.WorldNBTStorage;
@@ -24,7 +24,7 @@ index 2eb2c0c93b0d67ad7474e37158dab44018c9cbac..3e3f2a3d3b5ab32f498b4dd65f35f4c2
  import org.bukkit.event.inventory.InventoryType;
  import org.bukkit.event.player.PlayerChatTabCompleteEvent;
  import org.bukkit.event.server.BroadcastMessageEvent;
-@@ -786,7 +788,13 @@ public final class CraftServer implements Server {
+@@ -791,7 +793,13 @@ public final class CraftServer implements Server {
  
          // Spigot start
          if (!org.spigotmc.SpigotConfig.unknownCommandMessage.isEmpty()) {
diff --git a/Spigot-Server-Patches/0151-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0151-Basic-PlayerProfile-API.patch
index f05be280be..07e9abf8b5 100644
--- a/Spigot-Server-Patches/0151-Basic-PlayerProfile-API.patch
+++ b/Spigot-Server-Patches/0151-Basic-PlayerProfile-API.patch
@@ -509,7 +509,7 @@ 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 3e3f2a3d3b5ab32f498b4dd65f35f4c26470790f..6137bb510eec7d8c2ff2908b1255e56d1e2a39ef 100644
+index 419982244c8f5c9de69eb44ee27d23300132d859..1177801842d987c71feecf78bd2b79da747f41f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -228,6 +228,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -522,7 +522,7 @@ index 3e3f2a3d3b5ab32f498b4dd65f35f4c26470790f..6137bb510eec7d8c2ff2908b1255e56d
  public final class CraftServer implements Server {
      private final String serverName = "Paper"; // Paper
      private final String serverVersion;
-@@ -2245,5 +2248,24 @@ public final class CraftServer implements Server {
+@@ -2250,5 +2253,24 @@ public final class CraftServer implements Server {
      public boolean suggestPlayerNamesWhenNullTabCompletions() {
          return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
      }
diff --git a/Spigot-Server-Patches/0179-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0179-AsyncTabCompleteEvent.patch
index 45d31f9c2a..7bdeb1a27a 100644
--- a/Spigot-Server-Patches/0179-AsyncTabCompleteEvent.patch
+++ b/Spigot-Server-Patches/0179-AsyncTabCompleteEvent.patch
@@ -72,10 +72,10 @@ index 479d3f9d5fd8d619655811b32e8182cc23a538f9..c3651ff73c0831f0dd727f6358aa45fb
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6137bb510eec7d8c2ff2908b1255e56d1e2a39ef..2ace104c25b9e93ac643f17f99e3c01f979f7040 100644
+index 1177801842d987c71feecf78bd2b79da747f41f3..1f5a9fda92ea71bc38c57bf04ed230c2b6abaa20 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1792,7 +1792,7 @@ public final class CraftServer implements Server {
+@@ -1797,7 +1797,7 @@ public final class CraftServer implements Server {
              offers = tabCompleteChat(player, message);
          }
  
diff --git a/Spigot-Server-Patches/0201-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0201-getPlayerUniqueId-API.patch
index 3eba60a916..5d47ee607c 100644
--- a/Spigot-Server-Patches/0201-getPlayerUniqueId-API.patch
+++ b/Spigot-Server-Patches/0201-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 2ace104c25b9e93ac643f17f99e3c01f979f7040..f1bb3acf370ed71bc48116ce96396f999a34e83e 100644
+index 1f5a9fda92ea71bc38c57bf04ed230c2b6abaa20..a6baf56e4db6f2942cf67d3e5a28506e35d22122 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1488,6 +1488,26 @@ public final class CraftServer implements Server {
+@@ -1493,6 +1493,26 @@ public final class CraftServer implements Server {
          return recipients.size();
      }
  
diff --git a/Spigot-Server-Patches/0253-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0253-Ignore-Dead-Entities-in-entityList-iteration.patch
index 4b25cd95d8..03d174561e 100644
--- a/Spigot-Server-Patches/0253-Ignore-Dead-Entities-in-entityList-iteration.patch
+++ b/Spigot-Server-Patches/0253-Ignore-Dead-Entities-in-entityList-iteration.patch
@@ -23,10 +23,10 @@ index 9cb2f3b31921870ddba044840e99eb04babe26bb..f0a836db74ad3e20778d3863223bc9a3
                      MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                      ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.chunkX, e.chunkZ);
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 18d55cea6258c7b59b79aec1bcdf358944d5b527..6154f7a7973168cbe294bc0f40894f05bf20513e 100644
+index cce7d64efceb9d2336aca1589a7a07379ec3f134..e0f1eb19ea1ceebe00a428c753fec13d317869dd 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -821,6 +821,7 @@ public class Chunk implements IChunkAccess {
+@@ -822,6 +822,7 @@ public class Chunk implements IChunkAccess {
  
              for (int i1 = 0; i1 < l; ++i1) {
                  Entity entity1 = (Entity) list1.get(i1);
@@ -34,7 +34,7 @@ index 18d55cea6258c7b59b79aec1bcdf358944d5b527..6154f7a7973168cbe294bc0f40894f05
  
                  if (entity1.getBoundingBox().c(axisalignedbb) && entity1 != entity) {
                      if (predicate == null || predicate.test(entity1)) {
-@@ -857,6 +858,7 @@ public class Chunk implements IChunkAccess {
+@@ -859,6 +860,7 @@ public class Chunk implements IChunkAccess {
  
              while (iterator.hasNext()) {
                  T entity = (T) iterator.next(); // CraftBukkit - decompile error
@@ -42,7 +42,7 @@ index 18d55cea6258c7b59b79aec1bcdf358944d5b527..6154f7a7973168cbe294bc0f40894f05
  
                  if ((entitytypes == null || entity.getEntityType() == entitytypes) && entity.getBoundingBox().c(axisalignedbb) && predicate.test(entity)) {
                      list.add(entity);
-@@ -878,6 +880,7 @@ public class Chunk implements IChunkAccess {
+@@ -881,6 +883,7 @@ public class Chunk implements IChunkAccess {
  
              while (iterator.hasNext()) {
                  T t0 = (T) iterator.next(); // CraftBukkit - decompile error
@@ -83,7 +83,7 @@ index 0d78071a1d91c0289992d84a3858102e56434356..46624d1832eb76aed688da5e1cf6c7dc
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e5e27c2ecc92f1a8c33cc7442e7034de1b4a4a84..fd314d9d530c347f9f78e81763a9a079b44aa751 100644
+index 9799e870ed5eff4053178b65e3f327892d5cfd5b..015fba96878fc48494bed06b94983ad408d186c5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1027,6 +1027,7 @@ public class CraftWorld implements World {
diff --git a/Spigot-Server-Patches/0261-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0261-Add-Early-Warning-Feature-to-WatchDog.patch
index 77462a851e..caf1d244c4 100644
--- a/Spigot-Server-Patches/0261-Add-Early-Warning-Feature-to-WatchDog.patch
+++ b/Spigot-Server-Patches/0261-Add-Early-Warning-Feature-to-WatchDog.patch
@@ -48,10 +48,10 @@ index 983868ef2b2d9bbec19ba8a23cb6376de015b53e..aea9e169f9a11378c176c0cc3ee5a0d5
                  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 f1bb3acf370ed71bc48116ce96396f999a34e83e..dce11770da204b09cdc2f89dceccb3cf4fae7ac6 100644
+index a6baf56e4db6f2942cf67d3e5a28506e35d22122..512f99a198db7a48bcb21aadbd38125260bce812 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -806,6 +806,7 @@ public final class CraftServer implements Server {
+@@ -811,6 +811,7 @@ public final class CraftServer implements Server {
  
      @Override
      public void reload() {
@@ -59,7 +59,7 @@ index f1bb3acf370ed71bc48116ce96396f999a34e83e..dce11770da204b09cdc2f89dceccb3cf
          reloadCount++;
          configuration = YamlConfiguration.loadConfiguration(getConfigFile());
          commandsConfiguration = YamlConfiguration.loadConfiguration(getCommandsConfigFile());
-@@ -924,6 +925,7 @@ public final class CraftServer implements Server {
+@@ -929,6 +930,7 @@ public final class CraftServer implements Server {
          enablePlugins(PluginLoadOrder.STARTUP);
          enablePlugins(PluginLoadOrder.POSTWORLD);
          getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.RELOAD));
diff --git a/Spigot-Server-Patches/0298-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0298-Add-Velocity-IP-Forwarding-Support.patch
index b265413c39..4769315fca 100644
--- a/Spigot-Server-Patches/0298-Add-Velocity-IP-Forwarding-Support.patch
+++ b/Spigot-Server-Patches/0298-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 dce11770da204b09cdc2f89dceccb3cf4fae7ac6..251433b5a0560cdfca298aca45c53191b74bc403 100644
+index 512f99a198db7a48bcb21aadbd38125260bce812..816f0e7a5f958b4e3ea2c1fe02fc46de0b6e5664 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -678,7 +678,7 @@ public final class CraftServer implements Server {
+@@ -683,7 +683,7 @@ public final class CraftServer implements Server {
      @Override
      public long getConnectionThrottle() {
          // Spigot Start - Automatically set connection throttle for bungee configurations
diff --git a/Spigot-Server-Patches/0312-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0312-Make-the-default-permission-message-configurable.patch
index d810b36626..b8bbce1646 100644
--- a/Spigot-Server-Patches/0312-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-Server-Patches/0312-Make-the-default-permission-message-configurable.patch
@@ -29,10 +29,10 @@ index 2aca8cc2be963b2b015e52cdec6b3843011f1ccb..346da105776a0ae0cb06ed69f1f8f916
          Object val = config.get("settings.save-player-data");
          if (val instanceof Boolean) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 251433b5a0560cdfca298aca45c53191b74bc403..975b2b35324d5eb00a85b4771f68dd0b320c58e3 100644
+index 816f0e7a5f958b4e3ea2c1fe02fc46de0b6e5664..9dd46d0dd0e623a9fab98e8529d1c5f9912dbbb7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2271,6 +2271,11 @@ public final class CraftServer implements Server {
+@@ -2276,6 +2276,11 @@ public final class CraftServer implements Server {
          return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
      }
  
diff --git a/Spigot-Server-Patches/0348-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0348-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
index e5c9bc2545..0aedb0713b 100644
--- a/Spigot-Server-Patches/0348-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
+++ b/Spigot-Server-Patches/0348-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch
@@ -29,10 +29,10 @@ index 46503c75ced00902ef675ad1f3800fb9236a3703..44991803a489a42842f79ce51bdd53a7
  
      public boolean isDebugging() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 975b2b35324d5eb00a85b4771f68dd0b320c58e3..a4970ec90e27879ca82c3bdc0451984d5fe7af0d 100644
+index 9dd46d0dd0e623a9fab98e8529d1c5f9912dbbb7..c606ba5335a3843bfe98f9b3536afb991bf17464 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1788,7 +1788,7 @@ public final class CraftServer implements Server {
+@@ -1793,7 +1793,7 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean isPrimaryThread() {
diff --git a/Spigot-Server-Patches/0367-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0367-Avoid-hopper-searches-if-there-are-no-items.patch
index 5fb1bb7116..d1feec61ab 100644
--- a/Spigot-Server-Patches/0367-Avoid-hopper-searches-if-there-are-no-items.patch
+++ b/Spigot-Server-Patches/0367-Avoid-hopper-searches-if-there-are-no-items.patch
@@ -14,7 +14,7 @@ And since minecart hoppers are used _very_ rarely near we can avoid alot of sear
 Combined, this adds up a lot.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 4ff3eff58fa8007eca7eec22ef53d23705a98ed9..211e4353e88ad703c7f6aa8e416e6a50909bb3d7 100644
+index 379291bca1cadbb5d82451d7b2c484bc89386172..80ddcb1001324a545a20a53b9deff18ddd305bc4 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -85,6 +85,10 @@ public class Chunk implements IChunkAccess {
@@ -54,7 +54,7 @@ index 4ff3eff58fa8007eca7eec22ef53d23705a98ed9..211e4353e88ad703c7f6aa8e416e6a50
          entityCounts.decrement(entity.getMinecraftKeyString());
          this.markDirty(); // Paper
          // Paper end
-@@ -857,6 +873,14 @@ public class Chunk implements IChunkAccess {
+@@ -859,6 +875,14 @@ public class Chunk implements IChunkAccess {
          for (int k = i; k <= j; ++k) {
              Iterator iterator = this.entitySlices[k].iterator(); // Spigot
  
@@ -69,7 +69,7 @@ index 4ff3eff58fa8007eca7eec22ef53d23705a98ed9..211e4353e88ad703c7f6aa8e416e6a50
              while (iterator.hasNext()) {
                  T entity = (T) iterator.next(); // CraftBukkit - decompile error
                  if (entity.shouldBeRemoved) continue; // Paper
-@@ -876,9 +900,29 @@ public class Chunk implements IChunkAccess {
+@@ -879,9 +903,29 @@ public class Chunk implements IChunkAccess {
          i = MathHelper.clamp(i, 0, this.entitySlices.length - 1);
          j = MathHelper.clamp(j, 0, this.entitySlices.length - 1);
  
@@ -100,7 +100,7 @@ index 4ff3eff58fa8007eca7eec22ef53d23705a98ed9..211e4353e88ad703c7f6aa8e416e6a50
                  T t0 = (T) iterator.next(); // CraftBukkit - decompile error
                  if (t0.shouldBeRemoved) continue; // Paper
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index 5319ee9314f23b3323015efc40ad8a0287ad6368..94d90eb50a8b0ce104128ef016692ad91a883c2a 100644
+index 3d54b7a4bf102dfc568e782706f67e4b5269eaf1..3913af9e27139538114580f7967cbf990d9307f7 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -11,6 +11,7 @@ public final class IEntitySelector {
diff --git a/Spigot-Server-Patches/0381-Expose-the-internal-current-tick.patch b/Spigot-Server-Patches/0381-Expose-the-internal-current-tick.patch
index c1b353fb88..ae5e80aa4e 100644
--- a/Spigot-Server-Patches/0381-Expose-the-internal-current-tick.patch
+++ b/Spigot-Server-Patches/0381-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 a4970ec90e27879ca82c3bdc0451984d5fe7af0d..04a01b85c60e68347a32db5d92e53fc949622517 100644
+index c606ba5335a3843bfe98f9b3536afb991bf17464..ecfbf331c87e7891699eb0e07a25b946c6222b9a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2294,5 +2294,10 @@ public final class CraftServer implements Server {
+@@ -2299,5 +2299,10 @@ public final class CraftServer implements Server {
          }
          return new com.destroystokyo.paper.profile.CraftPlayerProfile(uuid, name);
      }
diff --git a/Spigot-Server-Patches/0431-Add-tick-times-API-and-mspt-command.patch b/Spigot-Server-Patches/0431-Add-tick-times-API-and-mspt-command.patch
index da68336836..091936d1eb 100644
--- a/Spigot-Server-Patches/0431-Add-tick-times-API-and-mspt-command.patch
+++ b/Spigot-Server-Patches/0431-Add-tick-times-API-and-mspt-command.patch
@@ -147,10 +147,10 @@ index 3149caeee2ad6e31806530b794f265315105ef5a..0c469ad1fd477fdb6181c657b7b9e193
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 04a01b85c60e68347a32db5d92e53fc949622517..055e32abc31b2606e0ee429b0e51738448c833a6 100644
+index ecfbf331c87e7891699eb0e07a25b946c6222b9a..8238343fe4d434d88874bb06e2fbcfc0d289685a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2144,6 +2144,16 @@ public final class CraftServer implements Server {
+@@ -2149,6 +2149,16 @@ public final class CraftServer implements Server {
                  net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
          };
      }
diff --git a/Spigot-Server-Patches/0432-Expose-MinecraftServer-isRunning.patch b/Spigot-Server-Patches/0432-Expose-MinecraftServer-isRunning.patch
index 6a2bf40866..f9e4a0a39b 100644
--- a/Spigot-Server-Patches/0432-Expose-MinecraftServer-isRunning.patch
+++ b/Spigot-Server-Patches/0432-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 055e32abc31b2606e0ee429b0e51738448c833a6..b86eb9afb170b8a827ce3f6c85de08c75f260b14 100644
+index 8238343fe4d434d88874bb06e2fbcfc0d289685a..f546f7ac0484b6224b878ad39285ffccd7410b96 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2309,5 +2309,10 @@ public final class CraftServer implements Server {
+@@ -2314,5 +2314,10 @@ public final class CraftServer implements Server {
      public int getCurrentTick() {
          return net.minecraft.server.MinecraftServer.currentTick;
      }
diff --git a/Spigot-Server-Patches/0437-Improved-Watchdog-Support.patch b/Spigot-Server-Patches/0437-Improved-Watchdog-Support.patch
index 9d128877cc..608392912c 100644
--- a/Spigot-Server-Patches/0437-Improved-Watchdog-Support.patch
+++ b/Spigot-Server-Patches/0437-Improved-Watchdog-Support.patch
@@ -324,10 +324,10 @@ index 8c58581417ca3e0336359e7db65568a08e025d6d..0dac8af6680a7dc4ecbedf7070729769
              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 b86eb9afb170b8a827ce3f6c85de08c75f260b14..dec85293caeaf247ef58975f1f7dfd2bb095635d 100644
+index f546f7ac0484b6224b878ad39285ffccd7410b96..38cb08adf3f71ac40c70b3443b238ac1c67d2b4a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1788,7 +1788,7 @@ public final class CraftServer implements Server {
+@@ -1793,7 +1793,7 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean isPrimaryThread() {
@@ -337,7 +337,7 @@ index b86eb9afb170b8a827ce3f6c85de08c75f260b14..dec85293caeaf247ef58975f1f7dfd2b
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 0176b72d8a1b54e57a462272dac16d3416fa7cd8..b9e14473ed7e1e07f14246f06ef4070a90f03f3f 100644
+index 67331fa5463dd31e4aea3aebf6204ec5cb43d99e..45da87c75a788037b638088d9249b20b7f9b2686 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 {
diff --git a/Spigot-Server-Patches/0465-Implement-Mob-Goal-API.patch b/Spigot-Server-Patches/0465-Implement-Mob-Goal-API.patch
index a6bab4390c..84cf50fd74 100644
--- a/Spigot-Server-Patches/0465-Implement-Mob-Goal-API.patch
+++ b/Spigot-Server-Patches/0465-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 0acaa3d463995a1863f97a6951fcbdfd61a8ef7e..2b2d292fdd13d86159a791acfd1e70217401e795 100644
+index af92698d6baa9db019d37fd2400c90b03ab92364..cc4f4a8883972cb639fe9df1f583b01d0571ebb8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2321,5 +2321,11 @@ public final class CraftServer implements Server {
+@@ -2326,5 +2326,11 @@ public final class CraftServer implements Server {
      public boolean isStopping() {
          return net.minecraft.server.MinecraftServer.getServer().hasStopped();
      }
diff --git a/Spigot-Server-Patches/0469-No-Tick-view-distance-implementation.patch b/Spigot-Server-Patches/0469-No-Tick-view-distance-implementation.patch
index 6aed9bebb1..4fa020b475 100644
--- a/Spigot-Server-Patches/0469-No-Tick-view-distance-implementation.patch
+++ b/Spigot-Server-Patches/0469-No-Tick-view-distance-implementation.patch
@@ -37,7 +37,7 @@ index de95bd406173c38fa8a745c201b5cd5fbec91702..9e55c800eb8b4dd4930dbf730bb6d106
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 0bdd463a35d4b45fd6e50ab35046f1783600d3ee..b88a0e6a27735e124ff2be2d44c8df4192298606 100644
+index ad96ed28acf7fbacbebc78a6156034887bc300a3..5b033dd3ce11fb8c7579cd41725fc70d8cf97857 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -201,7 +201,51 @@ public class Chunk implements IChunkAccess {
@@ -92,7 +92,7 @@ index 0bdd463a35d4b45fd6e50ab35046f1783600d3ee..b88a0e6a27735e124ff2be2d44c8df41
      }
  
      public final boolean isAnyNeighborsLoaded() {
-@@ -1085,7 +1129,7 @@ public class Chunk implements IChunkAccess {
+@@ -1088,7 +1132,7 @@ public class Chunk implements IChunkAccess {
                      IBlockData iblockdata = this.getType(blockposition);
                      IBlockData iblockdata1 = Block.b(iblockdata, (GeneratorAccess) this.world, blockposition);
  
diff --git a/Spigot-Server-Patches/0476-Wait-for-Async-Tasks-during-shutdown.patch b/Spigot-Server-Patches/0476-Wait-for-Async-Tasks-during-shutdown.patch
index ca0151a611..6a4f651dd5 100644
--- a/Spigot-Server-Patches/0476-Wait-for-Async-Tasks-during-shutdown.patch
+++ b/Spigot-Server-Patches/0476-Wait-for-Async-Tasks-during-shutdown.patch
@@ -22,10 +22,10 @@ index a91a581b25b19d62949f641847b633208672fb1e..450c04c5a1153ea9d11d005f3be623bb
          // 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 2b2d292fdd13d86159a791acfd1e70217401e795..9319dccbe6a33001cfb27866fd1d078e73fcc1e7 100644
+index cc4f4a8883972cb639fe9df1f583b01d0571ebb8..5d6d22fa67430a4489c6ff3bb1fe7cc3f57b25ba 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -935,6 +935,35 @@ public final class CraftServer implements Server {
+@@ -940,6 +940,35 @@ public final class CraftServer implements Server {
          org.spigotmc.WatchdogThread.hasStarted = true; // Paper - Disable watchdog early timeout on reload
      }
  
diff --git a/Spigot-Server-Patches/0495-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/Spigot-Server-Patches/0495-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
index ac0fc3102a..a5aeb76a54 100644
--- a/Spigot-Server-Patches/0495-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
+++ b/Spigot-Server-Patches/0495-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 9319dccbe6a33001cfb27866fd1d078e73fcc1e7..f27d734a1d94ff749f1d28f2509f4a0dc0fdd181 100644
+index 5d6d22fa67430a4489c6ff3bb1fe7cc3f57b25ba..360ecf3e1ef7c8f35f22448e8e333bcf9ad539fd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -347,7 +347,7 @@ public final class CraftServer implements Server {
@@ -34,7 +34,7 @@ index 9319dccbe6a33001cfb27866fd1d078e73fcc1e7..f27d734a1d94ff749f1d28f2509f4a0d
          minimumAPI = configuration.getString("settings.minimum-api");
          loadIcon();
      }
-@@ -830,7 +830,7 @@ public final class CraftServer implements Server {
+@@ -835,7 +835,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"));
diff --git a/Spigot-Server-Patches/0525-Allow-delegation-to-vanilla-chunk-gen.patch b/Spigot-Server-Patches/0525-Allow-delegation-to-vanilla-chunk-gen.patch
index 9f509ab996..8e7e2721a2 100644
--- a/Spigot-Server-Patches/0525-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/Spigot-Server-Patches/0525-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 f27d734a1d94ff749f1d28f2509f4a0dc0fdd181..6143357f44e7e1adb2a14010adfb1774cc0319a7 100644
+index 360ecf3e1ef7c8f35f22448e8e333bcf9ad539fd..ae03d893a7a3881d5e9b979107b3a79d37a2498f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1975,6 +1975,32 @@ public final class CraftServer implements Server {
+@@ -1980,6 +1980,32 @@ public final class CraftServer implements Server {
          return new CraftChunkData(world);
      }
  
diff --git a/Spigot-Server-Patches/0592-Add-getOfflinePlayerIfCached-String.patch b/Spigot-Server-Patches/0592-Add-getOfflinePlayerIfCached-String.patch
index 900dcd03c6..425600e539 100644
--- a/Spigot-Server-Patches/0592-Add-getOfflinePlayerIfCached-String.patch
+++ b/Spigot-Server-Patches/0592-Add-getOfflinePlayerIfCached-String.patch
@@ -5,10 +5,10 @@ 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 d8d29d14559169f5e8d8b4cf63d8b427b823eb2f..4e1b4d7cde8e0ea2d5e765dfc879db55e7bd669d 100644
+index eac64fe0dcbf4b7ab404ec510f85294a91419d1a..dc7de2b59ec5ca3e5fba34dbb2aa2e6aed8f95cb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1584,6 +1584,28 @@ public final class CraftServer implements Server {
+@@ -1589,6 +1589,28 @@ public final class CraftServer implements Server {
          return result;
      }
  
diff --git a/work/Bukkit b/work/Bukkit
index 721e678da0..8f495b8db1 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 721e678da027e7225ac51ccc878c64d50eab395a
+Subproject commit 8f495b8db1947dbd978ebbac81973e8793bf7967
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 5b747147e7..768d7fc2df 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 5b747147e79a5416f5893c2d5a980d9e9453db97
+Subproject commit 768d7fc2df23c3882bff4613b689bf5e9781e5ca
diff --git a/work/Spigot b/work/Spigot
index a19903d24b..628435a80b 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit a19903d24b3189e8769657b9b130f7ed5919b8b8
+Subproject commit 628435a80b4e69e07735824489f15c9689a411d7