Drop old packs in setResourcePack

patches/server/0015-Rewrite-dataconverter-system.patch

@@ -24896,18 +24896,10 @@ index e534dac9d69147174f6b9e8ce7f27fde536351ce..270fd52ec733c89bd91155c8222936fa
      }
 
 diff --git a/src/main/java/net/minecraft/world/level/storage/LevelStorageSource.java b/src/main/java/net/minecraft/world/level/storage/LevelStorageSource.java
-index 836bcea1c6a9de29b4a248220331f3a8c697204d..423405e34fc052e6c068d616c1aaedd8ab72ba94 100644
+index 836bcea1c6a9de29b4a248220331f3a8c697204d..399da9d43aefbb95897df4697860d5bce5317152 100644
 --- a/src/main/java/net/minecraft/world/level/storage/LevelStorageSource.java
 +++ b/src/main/java/net/minecraft/world/level/storage/LevelStorageSource.java
-@@ -5,6 +5,7 @@ import com.mojang.datafixers.DataFixer;
- import com.mojang.logging.LogUtils;
- import com.mojang.serialization.DataResult;
- import com.mojang.serialization.Dynamic;
-+import com.mojang.serialization.DynamicOps;
- import com.mojang.serialization.Lifecycle;
- import java.io.BufferedOutputStream;
- import java.io.BufferedReader;
-@@ -290,10 +291,10 @@ public class LevelStorageSource {
+@@ -290,10 +290,10 @@ public class LevelStorageSource {
      static Dynamic<?> readLevelDataTagFixed(Path path, DataFixer dataFixer) throws IOException {
          CompoundTag nbttagcompound = LevelStorageSource.readLevelDataTagRaw(path);
          CompoundTag nbttagcompound1 = nbttagcompound.getCompound("Data");
@@ -24920,7 +24912,7 @@ index 836bcea1c6a9de29b4a248220331f3a8c697204d..423405e34fc052e6c068d616c1aaedd8
 
          dynamic = dynamic.set("Player", dynamic2);
          Dynamic<?> dynamic3 = dynamic.get("WorldGenSettings").orElseEmptyMap();
-@@ -303,6 +304,12 @@ public class LevelStorageSource {
+@@ -303,6 +303,12 @@ public class LevelStorageSource {
          return dynamic;
      }
 

patches/server/0064-Complete-resource-pack-API.patch

@@ -22,10 +22,18 @@ index 0a6feccc657e62d7bad5e1461d5538a4c3a16b76..53833e155cf0d2328f2c2b3670297092
      }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a58b0d10d73310587a05e40e072029ee258063e1..00b1f8c60aa2021bfae42fd7bfab3d5edb55a098 100644
+index a58b0d10d73310587a05e40e072029ee258063e1..6da1b2f54317ddc84a1fbff037560e402b02f771 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -192,6 +192,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -44,6 +44,7 @@ import net.minecraft.network.chat.Component;
+ import net.minecraft.network.chat.PlayerChatMessage;
+ import net.minecraft.network.protocol.Packet;
+ import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
++import net.minecraft.network.protocol.common.ClientboundResourcePackPopPacket;
+ import net.minecraft.network.protocol.common.ClientboundResourcePackPushPacket;
+ import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+ import net.minecraft.network.protocol.game.ClientboundBlockDestructionPacket;
+@@ -192,6 +193,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private double healthScale = 20;
      private CraftWorldBorder clientWorldBorder = null;
      private BorderChangeListener clientWorldBorderListener = this.createWorldBorderListener();
@@ -36,7 +44,7 @@ index a58b0d10d73310587a05e40e072029ee258063e1..00b1f8c60aa2021bfae42fd7bfab3d5e
 
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
          super(server, entity);
-@@ -2387,6 +2391,45 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2387,6 +2392,46 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean getAffectsSpawning() {
          return this.getHandle().affectsSpawning;
      }
@@ -58,6 +66,7 @@ index a58b0d10d73310587a05e40e072029ee258063e1..00b1f8c60aa2021bfae42fd7bfab3d5e
 +        net.minecraft.network.chat.Component promptComponent = resourcePackPrompt != null ?
 +                            io.papermc.paper.adventure.PaperAdventure.asVanilla(resourcePackPrompt) :
 +                           null;
++        this.getHandle().connection.send(new ClientboundResourcePackPopPacket(Optional.empty()));
 +        this.getHandle().connection.send(new ClientboundResourcePackPushPacket(UUID.randomUUID(), url, hash, required, promptComponent));
 +    }
 +

patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch

@@ -44,10 +44,10 @@ index b76ac10fe0d4b860a4b30fae365cf38400afb456..1e2d3040bb3e8b1901fbc933caa5ad3b
 
      protected void internalSetAbsorptionAmount(float absorptionAmount) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 06c0f72a83de5866f4c734c0809d60446a736af6..07960b6ff0cd42622315a27beb1496d41950f9f4 100644
+index 6da1b2f54317ddc84a1fbff037560e402b02f771..0599752a23363405b6af1e89521badf3bf6643f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2182,6 +2182,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2183,6 +2183,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
 
      public void setRealHealth(double health) {

patches/server/0120-String-based-Action-Bar-API.patch

@@ -26,10 +26,10 @@ index cb88a3a4e4c87a6d6c838183c1640b13d82c9344..0b391b0dc6262ef482c4a253a074b593
          // Paper end
          buf.writeComponent(this.text);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 07960b6ff0cd42622315a27beb1496d41950f9f4..6b8734cda9d1384d929795f69de36887acafd698 100644
+index 0599752a23363405b6af1e89521badf3bf6643f3..ab0b31a41b9a35f3ff19c73a99d0392a303c2b53 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -349,6 +349,29 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -350,6 +350,29 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
 
      // Paper start

patches/server/0157-Expose-client-protocol-version-and-virtual-host.patch

@@ -90,10 +90,10 @@ index 0d9658b1c6b5912a34058c0ce53b8e7f8c28afac..203fc53142bb0c9b6e2d1876fe8dfbe3
 
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 28f71ea4234e122e28d65ffa66c3684f3a2857b4..2c31e9052e3b18177660ad9befc6fcd24085da88 100644
+index ab0b31a41b9a35f3ff19c73a99d0392a303c2b53..7115d71cfd514a4cdc2b0d2b17b87fb6fff21ee7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -295,6 +295,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -296,6 +296,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
 

patches/server/0167-Ability-to-apply-mending-to-XP-API.patch

@@ -14,10 +14,10 @@ public net.minecraft.world.entity.ExperienceOrb durabilityToXp(I)I
 public net.minecraft.world.entity.ExperienceOrb xpToDurability(I)I
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2c31e9052e3b18177660ad9befc6fcd24085da88..a5014c7a0cb6329edd919c7fafed8ec396b23c36 100644
+index 7115d71cfd514a4cdc2b0d2b17b87fb6fff21ee7..352c16b89f0e33aefef141fea0bf8067208cffcf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1549,7 +1549,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1550,7 +1550,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
 
      @Override

patches/server/0180-Player.setPlayerProfile-API.patch

@@ -55,10 +55,10 @@ index 477d3245facb5ae59c786d4f696f64226cb540a6..e8490a58dd4d9bc39a5bb2f9fc109526
 
      public Server getServer() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a5014c7a0cb6329edd919c7fafed8ec396b23c36..4e72258af26918dc9a9ab5afcb70acfaae4691a2 100644
+index 352c16b89f0e33aefef141fea0bf8067208cffcf..f4a6a3f9c6c8972f482a53ee434dc8631d32632d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -278,11 +278,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -279,11 +279,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.server.getPlayer(this.getUniqueId()) != null;
      }
 
@@ -70,7 +70,7 @@ index a5014c7a0cb6329edd919c7fafed8ec396b23c36..4e72258af26918dc9a9ab5afcb70acfa
      @Override
      public InetSocketAddress getAddress() {
          if (this.getHandle().connection == null) return null;
-@@ -1699,8 +1694,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1700,8 +1695,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
 
      private void untrackAndHideEntity(org.bukkit.entity.Entity entity) {
          // Remove this entity from the hidden player's EntityTrackerEntry
@@ -87,7 +87,7 @@ index a5014c7a0cb6329edd919c7fafed8ec396b23c36..4e72258af26918dc9a9ab5afcb70acfa
          ChunkMap.TrackedEntity entry = tracker.entityMap.get(other.getId());
          if (entry != null) {
              entry.removePlayer(this.getHandle());
-@@ -1713,8 +1715,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1714,8 +1716,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  this.getHandle().connection.send(new ClientboundPlayerInfoRemovePacket(List.of(otherPlayer.getUUID())));
              }
          }
@@ -96,7 +96,7 @@ index a5014c7a0cb6329edd919c7fafed8ec396b23c36..4e72258af26918dc9a9ab5afcb70acfa
      }
 
      void resetAndHideEntity(org.bukkit.entity.Entity entity) {
-@@ -1779,12 +1779,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1780,12 +1780,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
 
      private void trackAndShowEntity(org.bukkit.entity.Entity entity) {
@@ -122,7 +122,7 @@ index a5014c7a0cb6329edd919c7fafed8ec396b23c36..4e72258af26918dc9a9ab5afcb70acfa
          }
 
          ChunkMap.TrackedEntity entry = tracker.entityMap.get(other.getId());
-@@ -1794,6 +1807,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1795,6 +1808,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
 
          this.server.getPluginManager().callEvent(new PlayerShowEntityEvent(this, entity));
      }
@@ -162,7 +162,7 @@ index a5014c7a0cb6329edd919c7fafed8ec396b23c36..4e72258af26918dc9a9ab5afcb70acfa
 
      void resetAndShowEntity(org.bukkit.entity.Entity entity) {
          // SPIGOT-7312: Can't show/hide self
-@@ -1805,6 +1851,36 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1806,6 +1852,36 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              this.trackAndShowEntity(entity);
          }
      }

patches/server/0185-Flag-to-disable-the-channel-limit.patch

@@ -9,18 +9,18 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4e72258af26918dc9a9ab5afcb70acfaae4691a2..43e577dc39db6e9b373db0e67dc72e770150339b 100644
+index f4a6a3f9c6c8972f482a53ee434dc8631d32632d..90de9ce49cf067335ce881a2806fa18ef9e5d556 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -195,6 +195,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -196,6 +196,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      // Paper start
      private org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus;
      private String resourcePackHash;
 +    private static final boolean DISABLE_CHANNEL_LIMIT = System.getProperty("paper.disableChannelLimit") != null; // Paper - add a flag to disable the channel limit
      // Paper end
 
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
-@@ -2111,7 +2112,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2112,7 +2113,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      // Paper end
 
      public void addChannel(String channel) {

patches/server/0214-InventoryCloseEvent-Reason-API.patch

@@ -173,10 +173,10 @@ index 7d6301ae9ee2added007b0c68ffabe5d79f7be62..801dca6bbafd6e1825a1291fc128efc1
      @Override
      public boolean isBlocking() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 43e577dc39db6e9b373db0e67dc72e770150339b..2f3365c2cc45ebc4cc27a04f2383d7e102637722 100644
+index 90de9ce49cf067335ce881a2806fa18ef9e5d556..9718d1f36db4f41140e3b7b2ff008038ca4f9cb8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1200,7 +1200,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1201,7 +1201,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
 
          // Close any foreign inventory
          if (this.getHandle().containerMenu != this.getHandle().inventoryMenu) {

patches/server/0250-Expose-attack-cooldown-methods-for-Player.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 2f3365c2cc45ebc4cc27a04f2383d7e102637722..193a2634344f06fcdad47aea9e6924f0b839cfba 100644
+index 9718d1f36db4f41140e3b7b2ff008038ca4f9cb8..c7aed877d5e1976da8407075e69a75eb2837bff3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2862,6 +2862,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2864,6 +2864,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
 
          return this.adventure$pointers;
      }

patches/server/0251-Improve-death-events.patch

@@ -392,10 +392,10 @@ index 948ba97e318506dad96e59121297b5bf8340d2e6..810bead2f19de70786027b190137f743
          this.gameEvent(GameEvent.ENTITY_DIE);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 193a2634344f06fcdad47aea9e6924f0b839cfba..22b96810ad263112ddbc01d5081d56b5bd3fff2a 100644
+index c7aed877d5e1976da8407075e69a75eb2837bff3..e7c81627e8e9a959b2db521a30e16dcda98ef145 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2360,7 +2360,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2361,7 +2361,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public void sendHealthUpdate() {
          FoodData foodData = this.getHandle().getFoodData();

patches/server/0288-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch

@@ -106,18 +106,18 @@ index e8490a58dd4d9bc39a5bb2f9fc109526e031b971..5f590575f95eff8bf0cdcafde7dee0e3
      public Location getLastDeathLocation() {
          if (this.getData().contains("LastDeathLocation", 10)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 22b96810ad263112ddbc01d5081d56b5bd3fff2a..3acd32648f85e71f456ed9ae5e384b504aff01c8 100644
+index e7c81627e8e9a959b2db521a30e16dcda98ef145..00a5e27fc3e2e566642c5f5c730c3c4c97abe2cb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -196,6 +196,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -197,6 +197,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus;
      private String resourcePackHash;
      private static final boolean DISABLE_CHANNEL_LIMIT = System.getProperty("paper.disableChannelLimit") != null; // Paper - add a flag to disable the channel limit
 +    private long lastSaveTime;
      // Paper end
 
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
-@@ -1961,6 +1962,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1962,6 +1963,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          this.firstPlayed = firstPlayed;
      }
 
@@ -136,7 +136,7 @@ index 22b96810ad263112ddbc01d5081d56b5bd3fff2a..3acd32648f85e71f456ed9ae5e384b50
      public void readExtraData(CompoundTag nbttagcompound) {
          this.hasPlayedBefore = true;
          if (nbttagcompound.contains("bukkit")) {
-@@ -1983,6 +1996,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1984,6 +1997,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
 
      public void setExtraData(CompoundTag nbttagcompound) {
@@ -145,7 +145,7 @@ index 22b96810ad263112ddbc01d5081d56b5bd3fff2a..3acd32648f85e71f456ed9ae5e384b50
          if (!nbttagcompound.contains("bukkit")) {
              nbttagcompound.put("bukkit", new CompoundTag());
          }
-@@ -1997,6 +2012,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1998,6 +2013,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          data.putLong("firstPlayed", this.getFirstPlayed());
          data.putLong("lastPlayed", System.currentTimeMillis());
          data.putString("lastKnownName", handle.getScoreboardName());

patches/server/0290-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch

@@ -8,10 +8,10 @@ We just add a check to ensure that the CraftPlayer's handle
 is a ServerPlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3acd32648f85e71f456ed9ae5e384b504aff01c8..54dbe08e2ed589ad6d67d1940467255e2d3d1978 100644
+index 00a5e27fc3e2e566642c5f5c730c3c4c97abe2cb..553c5b65f4cc42e915196fa60a939f020b935e3a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -253,8 +253,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -254,8 +254,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
 
      @Override
      public void remove() {

patches/server/0374-Implement-Player-Client-Options-API.patch

@@ -136,10 +136,10 @@ index 3a026f766e2d67e005ae8a06337d465f92c8d1f3..352fbab070ccdb683e9a7558292c86cc
          this.adventure$locale = net.kyori.adventure.translation.Translator.parseLocale(this.language); // Paper
          this.requestedViewDistance = clientOptions.viewDistance();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 54dbe08e2ed589ad6d67d1940467255e2d3d1978..20e1dfb1c5616b93b20139c2023fbac54348e0cd 100644
+index 553c5b65f4cc42e915196fa60a939f020b935e3a..74b36a42971976c4205f0638dee5eb78e1014bcd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -615,6 +615,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -616,6 +616,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              connection.disconnect(message == null ? net.kyori.adventure.text.Component.empty() : message);
          }
      }