Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2fa8efc Updated Upstream (Bukkit/CraftBukkit) (#9485)
PaperMC/Paper@508a295 Only erase allay memory on non-item targets (#9570)
PaperMC/Paper@31358d5 API for updating recipes on clients (#6463)
PaperMC/Paper@8fe8ca6 Add clickable version on version command (#9347)
PaperMC/Paper@d6d2b6f Only capture actual tree growth (#6464)

gradle.properties

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.20.1-R0.1-SNAPSHOT
 
 mcVersion = 1.20.1
-paperCommit = 69a801305d3148d49672401e83905d95bfc950ec
+paperCommit = d6d2b6f4e51b24867b609cf747ac6d8c6345c449
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0003-Purpur-config-files.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 6b72eccdcb6f75534a4267a1dd0a4cc2f39e917b..0a07aaff7859e01acaae05e343df08585d0db63f 100644
+index 68206cf0178c26c0f528a1e14a5fb4e9ad410369..7e3c17cebaa4f648290eac87940a425826fe72d2 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2030,6 +2030,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2081,6 +2081,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Paper end
 

patches/api/0005-Purpur-client-support.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 4f710a941954a3d94acabe2a83bee050ad1ff052..864dbde8e9810dcd39abafdced3fc40bc2dfd589 100644
+index 14c92390aeaeee518f43778ccd5fc820fdc62689..34f3fed298840b4e1bf8ec787999bdd1d7cc1d82 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3175,4 +3175,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3241,4 +3241,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end

patches/api/0010-AFK-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 864dbde8e9810dcd39abafdced3fc40bc2dfd589..4f26113e9ee9e0826220cdc8a2f59a2b7afa0c22 100644
+index 34f3fed298840b4e1bf8ec787999bdd1d7cc1d82..e595d8f4858c70e6ad1a9cbcd4c48276a9652036 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3183,5 +3183,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3249,5 +3249,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @return True if Player uses Purpur Client
       */
      public boolean usesPurpurClient();

patches/api/0011-Bring-back-server-name.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index b243db56756c67cd2c41d7768898d01539f9260a..acdfd691f56de28285f1bf919fbbc7c31f6ea33b 100644
+index f380a518bc444bfdfbbedf38805c7684e53a5629..d3e3f1781ac04e0d3a24476de856ba72f25c02f1 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2662,4 +2662,15 @@ public final class Bukkit {
+@@ -2714,4 +2714,15 @@ public final class Bukkit {
      public static Server.Spigot spigot() {
          return server.spigot();
      }
@@ -25,10 +25,10 @@ index b243db56756c67cd2c41d7768898d01539f9260a..acdfd691f56de28285f1bf919fbbc7c3
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 0a07aaff7859e01acaae05e343df08585d0db63f..f8fbd64640c9d0035d7c79ce6a568b485f095f87 100644
+index 7e3c17cebaa4f648290eac87940a425826fe72d2..33778dcc7c723ce210b5f5c6e03fd3678dcc11b0 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2325,4 +2325,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2376,4 +2376,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      boolean isOwnedByCurrentRegion(@NotNull Entity entity);
      // Paper end - Folia region threading API

patches/api/0014-Lagging-threshold.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index acdfd691f56de28285f1bf919fbbc7c31f6ea33b..df4a4bc5d5423fa966910db1719dabd665eb8d71 100644
+index d3e3f1781ac04e0d3a24476de856ba72f25c02f1..728822f51d615bd2f4cb3cc1f2097309cac15fef 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2672,5 +2672,14 @@ public final class Bukkit {
+@@ -2724,5 +2724,14 @@ public final class Bukkit {
      public static String getServerName() {
          return server.getServerName();
      }
@@ -24,10 +24,10 @@ index acdfd691f56de28285f1bf919fbbc7c31f6ea33b..df4a4bc5d5423fa966910db1719dabd6
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f8fbd64640c9d0035d7c79ce6a568b485f095f87..3fb416b31132596a6c336eed62ccc5fa69f35497 100644
+index 33778dcc7c723ce210b5f5c6e03fd3678dcc11b0..1a1aebe2a398fa433179220e16058c1fb513de94 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2333,5 +2333,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2384,5 +2384,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      String getServerName();

patches/api/0016-Player-invulnerabilities.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 4f26113e9ee9e0826220cdc8a2f59a2b7afa0c22..143add524c7f3bca66a36522031ab56ce6ad714b 100644
+index e595d8f4858c70e6ad1a9cbcd4c48276a9652036..c5ed6ced17316c0af396520f7f1fa25bdc1a944d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3202,5 +3202,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3268,5 +3268,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Reset the idle timer back to 0
       */
      void resetIdleTimer();

patches/api/0035-Clean-up-version-command-output.patch

@@ -22,30 +22,30 @@ index a736d7bcdc5861a01b66ba36158db1c716339346..22fc165fd9c95f0f3ae1be7a0857e48c
 
          @Override
 diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index e40f017f87d6b6b4770501b106c76dc69ec69abb..eac5830986cd0638950bbb1e6f10a30e246e09a7 100644
+index fd5d9881abfd930bb883120f018f76dc78b62b14..d3dadad49df09e85c724c93e8cc88da2c985e9b4 100644
 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-@@ -198,7 +198,7 @@ public class VersionCommand extends BukkitCommand {
+@@ -214,7 +214,7 @@ public class VersionCommand extends BukkitCommand {
          String version = Bukkit.getVersion();
          // Paper start
          if (version.startsWith("null")) { // running from ide?
--            setVersionMessage(net.kyori.adventure.text.Component.text("Unknown version, custom build?", net.kyori.adventure.text.format.NamedTextColor.YELLOW));
-+            setVersionMessage(net.kyori.adventure.text.Component.text("* Unknown version, custom build?", net.kyori.adventure.text.format.NamedTextColor.RED)); // Purpur
+-            setVersionMessage(Component.text("Unknown version, custom build?", NamedTextColor.YELLOW));
++            setVersionMessage(Component.text("* Unknown version, custom build?", NamedTextColor.RED)); // Purpur
              return;
          }
          setVersionMessage(getVersionFetcher().getVersionMessage(version));
-@@ -239,9 +239,11 @@ public class VersionCommand extends BukkitCommand {
+@@ -255,9 +255,11 @@ public class VersionCommand extends BukkitCommand {
      // Paper start
-     private void setVersionMessage(final @NotNull net.kyori.adventure.text.Component msg) {
+     private void setVersionMessage(final @NotNull Component msg) {
          lastCheck = System.currentTimeMillis();
--        final net.kyori.adventure.text.Component message = net.kyori.adventure.text.TextComponent.ofChildren(
--            net.kyori.adventure.text.Component.text(Bukkit.getVersionMessage(), net.kyori.adventure.text.format.NamedTextColor.WHITE),
--            net.kyori.adventure.text.Component.newline(),
+-        final Component message = Component.textOfChildren(
+-            Component.text(Bukkit.getVersionMessage(), NamedTextColor.WHITE),
+-            Component.newline(),
 +        // Purpur start
 +        int distance = getVersionFetcher().distance();
-+        final net.kyori.adventure.text.Component message = net.kyori.adventure.text.Component.join(net.kyori.adventure.text.JoinConfiguration.separator(net.kyori.adventure.text.Component.newline()),
++        final Component message = Component.join(net.kyori.adventure.text.JoinConfiguration.separator(Component.newline()),
 +            ChatColor.parseMM("<grey>Current: %s%s*", distance == 0 ? "<green>" : distance > 0 ? "<yellow>" : "<red>", Bukkit.getVersion()),
 +            // Purpur end
              msg
          );
-         this.versionMessage = net.kyori.adventure.text.Component.text()
+         this.versionMessage = Component.text()

patches/api/0036-Extended-OfflinePlayer-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Extended OfflinePlayer API
 
 
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index 4d014215dce2c2ff09a2701accf2db144603c55a..8cb7000bc5e4e3c987cb0ac73d113eedb141e178 100644
+index 9b84cb5abdf3db55cbc7ba19c8cd6955bf4fc5ec..5616d2acfa8180f71ae4123845fc126508f73b90 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
-@@ -476,4 +476,114 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
+@@ -506,4 +506,114 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
       */
      @Nullable
      public Location getLastDeathLocation();

patches/api/0037-Added-the-ability-to-add-combustible-items.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Added the ability to add combustible items
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index df4a4bc5d5423fa966910db1719dabd665eb8d71..79f78fdd7dc7c7ced0659e3740b14beff990b46e 100644
+index 728822f51d615bd2f4cb3cc1f2097309cac15fef..285c0b7a477991d43eaee088a522bb9fb5cac6aa 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2681,5 +2681,24 @@ public final class Bukkit {
+@@ -2733,5 +2733,24 @@ public final class Bukkit {
      public static boolean isLagging() {
          return server.isLagging();
      }
@@ -34,10 +34,10 @@ index df4a4bc5d5423fa966910db1719dabd665eb8d71..79f78fdd7dc7c7ced0659e3740b14bef
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 3fb416b31132596a6c336eed62ccc5fa69f35497..05136ca2556454df3dbeeb2f67105c5bfdad445f 100644
+index 1a1aebe2a398fa433179220e16058c1fb513de94..8e41a73b1b8add77fc7bf79b261554b528ec48d0 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2340,5 +2340,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2391,5 +2391,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return True if lagging
       */
      boolean isLagging();

patches/api/0045-Debug-Marker-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Debug Marker API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 79f78fdd7dc7c7ced0659e3740b14beff990b46e..478ba6da9befbc2983578d732e35f37a53789df0 100644
+index 285c0b7a477991d43eaee088a522bb9fb5cac6aa..b72708be4c431c4a8b8905d1872fdba4cefc10ae 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2700,5 +2700,89 @@ public final class Bukkit {
+@@ -2752,5 +2752,89 @@ public final class Bukkit {
      public static void removeFuel(@NotNull Material material) {
          server.removeFuel(material);
      }
@@ -99,10 +99,10 @@ index 79f78fdd7dc7c7ced0659e3740b14beff990b46e..478ba6da9befbc2983578d732e35f37a
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 05136ca2556454df3dbeeb2f67105c5bfdad445f..916b9a9f05c0e83109bc9a4eb1692e2ed6e81eaf 100644
+index 8e41a73b1b8add77fc7bf79b261554b528ec48d0..615c47f069d429e14993c60253f719b514849a67 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2355,5 +2355,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2406,5 +2406,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @param material The material that will no longer be a fuel
       */
      public void removeFuel(@NotNull Material material);
@@ -260,10 +260,10 @@ index 1fba792419ea6b5e8c640a2599e4b2dd16ee87d0..bf39c6602cfca70a6352519fa26059cd
 
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 143add524c7f3bca66a36522031ab56ce6ad714b..389d5a30cff2ed81a114a5933dd9e6437543fb41 100644
+index c5ed6ced17316c0af396520f7f1fa25bdc1a944d..3e826f0be104d98c2676b429a5a9b66ca437f681 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3223,5 +3223,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3289,5 +3289,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param invulnerableTicks Invulnerable ticks remaining
       */
      void setSpawnInvulnerableTicks(int invulnerableTicks);

patches/api/0046-Add-death-screen-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 389d5a30cff2ed81a114a5933dd9e6437543fb41..74a9e27b8d3147876483743e1107632e332b0571 100644
+index 3e826f0be104d98c2676b429a5a9b66ca437f681..fb99e05b4769af604f41d81f036cee3b8a6ec197 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3293,5 +3293,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3359,5 +3359,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Clears all debug block highlights
       */
      void clearBlockHighlights();

patches/server/0001-Pufferfish-Server-Changes.patch

@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 57f2c414dbfe127c193002fbc8eeb22e94e9cb55..3e651dd361ce4a0ccb20d624dc878e16b3bb62f5 100644
+index fb98936bb8a5488db75d676c5bcb4060597fbbf8..f6cd7b910ce41a254e71bf0fcfe93c38abbb1445 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -1668,7 +1668,7 @@ index 488a253e218409b5f0b4a872cee0928578fa7582..6e3b2863f04419ee6914ac3fd4f12a4f
 
      private void getFullChunk(long pos, Consumer<LevelChunk> chunkConsumer) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 81d0b2933040a451441f660f9e46199ae3b111e3..37c10d6a392d0400a7024bdd5214eb5e83aa3e82 100644
+index d934d07ad761319f338d4386536f68fde211c041..2d031430c49853e6ca87ff9f11eff70f7bb23a16 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -180,7 +180,8 @@ public class ServerEntity {
@@ -1755,7 +1755,7 @@ index 18aac3da3c88f33b1a71a5920a8daa27e9723913..eac31c3fcc9161711328588ac852fcae
              this.getRandomBlockPosition(j, 0, k, 15, blockposition);
              int normalY = chunk.getHeight(Heightmap.Types.MOTION_BLOCKING, blockposition.getX() & 15, blockposition.getZ() & 15) + 1;
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9d46536f80b5b3e6641fd377c02166a431edfd77..8a1fde50b82a8b0718ae04124c2611b7cff4bcd6 100644
+index dc5fda83a66afbfeb7897fc20b4742899d8aca08..1f49a53033a6f7f0e70b655531f2fbb4117f687b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1245,6 +1245,7 @@ public class ServerPlayer extends Player {
@@ -1791,18 +1791,18 @@ index 9d46536f80b5b3e6641fd377c02166a431edfd77..8a1fde50b82a8b0718ae04124c2611b7
 
      @Override
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 316740b2ba4c85828f544249c8cdd6fa1b525d3f..22d2e0e262cbc9b0c95e9978adf5561df4774d25 100644
+index 75bd92e1d40588d3bc40fa7837943eec9f2062a6..81c566877ad7ac98fcd9fe94d8e0c09f88fb2054 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1219,6 +1219,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -1221,6 +1221,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
 
      @Override
      public void handleEditBook(ServerboundEditBookPacket packet) {
 +        if (!gg.pufferfish.pufferfish.PufferfishConfig.enableBooks && !this.player.getBukkitEntity().hasPermission("pufferfish.usebooks")) return; // Pufferfish
          // Paper start
          if (!this.cserver.isPrimaryThread()) {
              List<String> pageList = packet.getPages();
-@@ -2365,6 +2366,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -2367,6 +2368,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
      }
 
      private boolean updateChatOrder(Instant timestamp) {
@@ -1935,7 +1935,7 @@ index 04b1531572e8fff1e46fe1c94e7fc863841e0f66..47ddc42f2b63d9d3fae5ae6ea93d4183
      int LARGE_MAX_STACK_SIZE = 64;
      int DEFAULT_DISTANCE_LIMIT = 8;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4c298406ce06d39f8279049270c88ec0830733b1..cccbec265c00b00c3261c9beead91f1ab3702d7d 100644
+index f189629f03503fc06b790729bd407b663a48e0db..02722358edf416e958e9181b2ecc781596801f8a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -306,7 +306,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3506,10 +3506,10 @@ index ebe65474a4a05ff1637d7f37ebcfe690af59def5..42142c512b12e5b269c19f1e821c50e7
 
      @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a05c1bc8874ef5e380544a6a344c848e37da49c4..bc9a4dc04589d4241560f73ae8c64f2fb8f6a4ca 100644
+index 54f27d91f941235a99e341ed84531ad7f0840728..a774e6af15993a97a231d45b676e26fb1128f05f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -264,7 +264,7 @@ import javax.annotation.Nullable; // Paper
+@@ -265,7 +265,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
 
  public final class CraftServer implements Server {
@@ -3518,7 +3518,7 @@ index a05c1bc8874ef5e380544a6a344c848e37da49c4..bc9a4dc04589d4241560f73ae8c64f2f
      private final String serverVersion;
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
-@@ -1139,6 +1139,11 @@ public final class CraftServer implements Server {
+@@ -1140,6 +1140,11 @@ public final class CraftServer implements Server {
                  plugin.getPluginMeta().getDisplayName(),
                  "This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
              ));