Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2eca2a2 Add Player#sendEquipmentChange(Map) API (#8800)
PaperMC/Paper@b082d89 Win Screen API (#8802)
PaperMC/Paper@b1b19b6 [ci skip] Fix PiglinBarterEvent JavaDoc (#8795)

gradle.properties

@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19.3-R0.1-SNAPSHOT
 
-paperCommit = 42fecd0a5f51c1d13941daeaed58f0a95b40e23e
+paperCommit = b1b19b67f255bb586cc36337946bd4d24d9c9b6f
 
 org.gradle.caching = true
 org.gradle.parallel = true

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 de960716478477ce199526b8f860cfafa1541ee9..4d6933038e95f4479a920f3a68db0943c5b1e6a1 100644
+index c68df5e5cc63b26da8623cf27e257ef07a61897d..ee238e894b10bf089fa3be496a81bcb647aa8100 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2920,4 +2920,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2946,4 +2946,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 4d6933038e95f4479a920f3a68db0943c5b1e6a1..910689c6c76c13660dc1539b0c5384d0c69615f2 100644
+index ee238e894b10bf089fa3be496a81bcb647aa8100..0416b3de7a2e439891aa7b8c2c7536d7f4096026 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2928,5 +2928,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2954,5 +2954,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @return True if Player uses Purpur Client
       */
      public boolean usesPurpurClient();

patches/api/0017-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 910689c6c76c13660dc1539b0c5384d0c69615f2..75ecd5d492ef443a7dc25205ba0796eea34e4ba7 100644
+index 0416b3de7a2e439891aa7b8c2c7536d7f4096026..2ab176269dea6035fd778640430f4f0fd499dd3b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2947,5 +2947,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2973,5 +2973,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Reset the idle timer back to 0
       */
      void resetIdleTimer();

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

@@ -260,10 +260,10 @@ index 8effbbd33c0af0ac421e5aef1586e8579ef097e4..0cd49cb31b21e52009f6220d505aa2a3
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 75ecd5d492ef443a7dc25205ba0796eea34e4ba7..9246df99c4247e361eaa27ea266981b7fec0c14b 100644
+index 2ab176269dea6035fd778640430f4f0fd499dd3b..b4b4d49de4edd13d9e0f24b8042ce6103e5b0466 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2968,5 +2968,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2994,5 +2994,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param invulnerableTicks Invulnerable ticks remaining
       */
      void setSpawnInvulnerableTicks(int invulnerableTicks);

patches/api/0050-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 0f1d925f9c338427e3fb8cdbbcd37569fc3b30ad..f65a860d09d9f1d5045b2af63a80109e7c1c4ddf 100644
+index b4b4d49de4edd13d9e0f24b8042ce6103e5b0466..b50a378f6de813a51ea57fced46d1df8eca6609a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3046,5 +3046,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3064,5 +3064,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Clears all debug block highlights
       */
      void clearBlockHighlights();

patches/api/0050-add-Player-showCreditScreen.patch

@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: granny <granny@purpurmc.org>
-Date: Fri, 26 Aug 2022 21:45:01 -0700
-Subject: [PATCH] add Player#showCreditScreen
-
-
-diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9246df99c4247e361eaa27ea266981b7fec0c14b..0f1d925f9c338427e3fb8cdbbcd37569fc3b30ad 100644
---- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2428,6 +2428,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      */
-     public void showDemoScreen();
- 
-+    /**
-+     * Shows the credits to the player, this screen is normally only seen after
-+     * going into the end portal for the first time.
-+     * <br>
-+     * Servers can modify the text on this screen using a resource pack.
-+     */
-+    public void showCreditScreen();
-+
-     /**
-      * Gets whether the player has the "Allow Server Listings" setting enabled.
-      *

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

@@ -17,7 +17,7 @@ index 7d6d3c8556033d289fdadc489e73fba478fce41a..c2ff5d7e4a9f7477b7b207e9d3fb7241
      public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
          super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c89e430cfddb431ee1d20e59f8bd60e3a3a952b9..f79ca89b430636bf5c0e140499ac20f743f22f33 100644
+index a50af1f62661622f4a162c7dbad4e7ff056a64ef..6ca749d957ff04f9c6e48271da0046a353508c10 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3505,6 +3505,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -43,10 +43,10 @@ index c89e430cfddb431ee1d20e59f8bd60e3a3a952b9..f79ca89b430636bf5c0e140499ac20f7
              try {
                  byte[] data = new byte[packet.data.readableBytes()];
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b32f44beab2c9790ee2da8403e362e8b3ecc6175..d12146a26ccdd534f43616ef8afe14f3883232c3 100644
+index 7c43de6ad6bd7259c6bcb2a55e312e8abfcf546b..a67b1164f44e731c6651055c6bb40cee7769d78b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3016,4 +3016,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3029,4 +3029,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.spigot;
      }
      // Spigot end

patches/server/0012-AFK-API.patch

@@ -73,7 +73,7 @@ index f6360f2973c03e0105361f9e001360ec01488ce6..e40144aad9182ccb2ed871d74378cf0a
          return this.stats;
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index ebc2707fa3eeec4c80d7f186fce39ddcbd8eb414..60dd6eb68e500d72e1189322d51d1c1fd71fe881 100644
+index 132c3e1ab9e65c778d3f1a7527a9f9c49337d8b4..668572e6819acdca4b658f693bf9069961dd3366 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -335,6 +335,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -218,7 +218,7 @@ index 3b959f42d958bf0f426853aee56753d6c455fcdb..d17abb283ea818244df0379d6b57fc63
                  if (range < 0.0D || d < range * range) {
                      return true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d12146a26ccdd534f43616ef8afe14f3883232c3..56cf4ce045dcd9d52beee849165cad3673601b54 100644
+index a67b1164f44e731c6651055c6bb40cee7769d78b..498fc20c89142448d72433774e2201cca183c936 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -524,10 +524,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -238,7 +238,7 @@ index d12146a26ccdd534f43616ef8afe14f3883232c3..56cf4ce045dcd9d52beee849165cad36
          for (ServerPlayer player : (List<ServerPlayer>) server.getHandle().players) {
              if (player.getBukkitEntity().canSee(this)) {
                  player.connection.send(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
-@@ -3022,5 +3027,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3035,5 +3040,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean usesPurpurClient() {
          return getHandle().purpurClient;
      }
@@ -281,7 +281,7 @@ index 2f684a8f976f1f1a18c31f4c1a7eba9080099e55..c517873abdcb1e5334ba9e7a1c2f06bb
  
      public static int barrelRows = 3;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a85c9f24729ea44ef072a6d3d9ffeb93e8f0a486..765523911e448bd7f73e3f6cb8d0e78ddecb9f66 100644
+index eb3953524cf7dc8a96fd7bcfddf2685565e7b60e..4c69037cd0f7c713da7b357b2f09f0e78adc2b10 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -93,6 +93,24 @@ public class PurpurWorldConfig {
@@ -310,7 +310,7 @@ index a85c9f24729ea44ef072a6d3d9ffeb93e8f0a486..765523911e448bd7f73e3f6cb8d0e78d
      public boolean untamedTamablesAreRidable = true;
      public boolean useNightVisionWhenRiding = false;
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index b87756d9a7b04ea2613208984b2583eca3f32af6..7529bca82efe4c33dbf781bcf6f8b583fa54fa95 100644
+index 63d3fcc45be732a4cd2dc8b5347d860fd6577bdd..f1abcd9c63d7bb9797f05e3764262e0080c60da2 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -203,6 +203,7 @@ public class ActivationRange

patches/server/0018-Player-invulnerabilities.patch

@@ -108,7 +108,7 @@ index 668572e6819acdca4b658f693bf9069961dd3366..367a3d1181f29375aed48a861dcf4c21
          this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
          // Paper end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 168abc1f0c795bf840ca87b301dfa85ac0b5dd16..a9ed0ddc7c5bedb4bca774caa583a6889259e4c0 100644
+index c8dedd2bfcc633ac1be891c8016dc9384e199796..0e09db289dadb812faf6850d6cbaf202fcc2facf 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -953,6 +953,8 @@ public abstract class PlayerList {
@@ -121,10 +121,10 @@ index 168abc1f0c795bf840ca87b301dfa85ac0b5dd16..a9ed0ddc7c5bedb4bca774caa583a688
          return entityplayer1;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 56cf4ce045dcd9d52beee849165cad3673601b54..d2bb97c72c75a5d56e1d34294717aec959779196 100644
+index 498fc20c89142448d72433774e2201cca183c936..e173e0c98862353cd333ebeaa0293bf86529b6e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3042,5 +3042,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3055,5 +3055,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleTimer() {
          getHandle().resetLastActionTime();
      }
@@ -146,7 +146,7 @@ index 56cf4ce045dcd9d52beee849165cad3673601b54..d2bb97c72c75a5d56e1d34294717aec9
      // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 765523911e448bd7f73e3f6cb8d0e78ddecb9f66..fcf58a69e8f3d0e3aa2566ddcdf05554aec979de 100644
+index 4c69037cd0f7c713da7b357b2f09f0e78adc2b10..875a0381b27077a5024a267eb545d61fd8e3dcf4 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -98,6 +98,8 @@ public class PurpurWorldConfig {

patches/server/0128-Add-EntityTeleportHinderedEvent.patch

@@ -93,10 +93,10 @@ index ba898640a8f693e8bae43281b170d3505154b273..39ae7bdac23601c567013799375bf32b
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f61a1326fa943b606de8f75a6b7f95b9e220047a..7448c124fd155d832c999f16b4ecdbfeec8c6119 100644
+index e173e0c98862353cd333ebeaa0293bf86529b6e4..bbfd1f9a35b0ae0a960b2cedbf92a8239b90fefa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1268,6 +1268,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1281,6 +1281,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
          if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API
@@ -108,7 +108,7 @@ index f61a1326fa943b606de8f75a6b7f95b9e220047a..7448c124fd155d832c999f16b4ecdbfe
          }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6157ebc52fb9c8018f09c6447368c0133d796487..db2e69bc1882eedd4800eca54da69d350fe4ec7a 100644
+index 664673d3a259e460eb8082504a518e3d10070887..886432ddfe3b9b22a3079f069881015fbdf434a5 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -120,6 +120,7 @@ public class PurpurWorldConfig {

patches/server/0216-Extended-OfflinePlayer-API.patch

@@ -223,10 +223,10 @@ index 714afc98b5150907b45a00060be4e41582333204..312a6d90c0a09570aef24c205dc2ff27
 +    // Purpur end - OfflinePlayer API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 32e71b5bd7aae211f9e6715eaf6bd67521a79253..0d63c9e3487c5543be1783d6c220214cbb86bc35 100644
+index bbfd1f9a35b0ae0a960b2cedbf92a8239b90fefa..440dd0a91077776267943fe13fedbfc405c5a886 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2232,6 +2232,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2245,6 +2245,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().getAbilities().walkingSpeed * 2f;
      }
  

patches/server/0282-Debug-Marker-API.patch

@@ -99,10 +99,10 @@ index fcc6ac180a74daffa173866be3dd97a3ad63ebd7..804f81c478c09a5b6d0b10a78dc2b7ae
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0d63c9e3487c5543be1783d6c220214cbb86bc35..1e04a20b9bc1a521da5831b3e888017ff41fe879 100644
+index 440dd0a91077776267943fe13fedbfc405c5a886..1a3f35120ac9550bb594c7d400009bd1a06a0b6d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3083,5 +3083,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3096,5 +3096,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
          getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
      }

patches/server/0283-add-Player-showCreditScreen.patch

@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: granny <granny@purpurmc.org>
-Date: Fri, 26 Aug 2022 21:45:00 -0700
-Subject: [PATCH] add Player#showCreditScreen
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1e04a20b9bc1a521da5831b3e888017ff41fe879..da50dc7c286e53bcce711e5313abfa45817beea7 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2620,6 +2620,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         this.getHandle().connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.DEMO_EVENT, ClientboundGameEventPacket.DEMO_PARAM_INTRO));
-     }
- 
-+    @Override
-+    public void showCreditScreen() {
-+        if (this.getHandle().connection == null) return;
-+
-+        this.getHandle().connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.WIN_GAME, 1F));
-+    }
-+
-     @Override
-     public boolean isAllowingServerListings() {
-         return this.getHandle().allowsListing();

patches/server/0283-mob-spawning-option-to-ignore-creative-players.patch

@@ -18,7 +18,7 @@ index fbb735915759ea59660daa809e23849a60fa5974..81ba3c4fa9502cdd2a5c58b0ff51fea6
                              if (entityhuman != null) {
                                  double d2 = entityhuman.distanceToSqr(d0, (double) i, d1);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 62bad1a35bae5fea6878e6734381cbbfe19e5673..4a78ea6c92922dc2742e90d1726f2ba39065449f 100644
+index b9657848cb3f0ae2c5d3c5db372d483d202e7c93..c0efea82bacda565876b8a01ed1f520706a2d127 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -376,6 +376,7 @@ public class PurpurWorldConfig {

patches/server/0286-Allay-respect-item-NBT.patch

@@ -44,7 +44,7 @@ index 910bf19c7325180f3121ae3982dddae9e4ea0e97..e8f42ad6cc32cb21584d8988fcf3d1e4
  
      private boolean allayConsidersItemEqual(ItemStack stack, ItemStack stack2) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ab6c9c87684e1be6276880e847856ee99a0b92a9..d06be7de030dbeb153ec452cf74751642de9c0d8 100644
+index af323d3136ca5d51ac122d5758251db965281020..b1312b36707aaae62d590994d8a3563901c32e94 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1061,10 +1061,13 @@ public class PurpurWorldConfig {

patches/server/0287-Add-death-screen-API.patch

@@ -30,10 +30,10 @@ index 53b75f5737a910ffc5448cd9a85eae57f9c1488f..ea95873dd034779e56a8b924cd27f937
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index da50dc7c286e53bcce711e5313abfa45817beea7..ed5ee1f76aad6c27e742cb421a8e94990ebb7c59 100644
+index 1a3f35120ac9550bb594c7d400009bd1a06a0b6d..5a76c967e2d9c9c1b09e8de33fcde34e25b4646b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3133,5 +3133,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3139,5 +3139,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (this.getHandle().connection == null) return;
          this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket(ClientboundCustomPayloadPacket.DEBUG_GAME_TEST_CLEAR, new FriendlyByteBuf(io.netty.buffer.Unpooled.buffer())));
      }

patches/server/0295-Language-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Language API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7f5010ef364705f05b304923ce6da4582d7de81e..b69634a5cf57e4086e644819f68638d6a2ab897c 100644
+index 0f0a1c1730cdcddc05b0d04411d79c54741a6b45..4a8aafd341fdad4b5ae326c4759b3381f5061fb5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -251,6 +251,7 @@ import org.bukkit.scoreboard.Criteria;

patches/server/0296-Milk-Keeps-Beneficial-Effects.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Milk Keeps Beneficial Effects
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index cd538b09f74170306d18fab9b16fd5750e8cc3ed..094afd5636590608c8ec31c9fec97614dfef60db 100644
+index 4a8f08ceb0f662b4356bbe80fc207e6e8a48c7ad..b2e4b5c463ceb19356da18e7fc52d20801b674cd 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1113,6 +1113,7 @@ public abstract class LivingEntity extends Entity {
@@ -17,7 +17,7 @@ index cd538b09f74170306d18fab9b16fd5750e8cc3ed..094afd5636590608c8ec31c9fec97614
                  if (event.isCancelled()) {
                      continue;
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index da9e749cf775fc4e3ec6846dab1f92e64f088442..6a4983999666c6b59c2c46f194190059574fb9df 100644
+index 3d2791665475387d88e32708eba94b526ad3a942..a2ad029160065baa395cfe20fa40881d8252fcb3 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 @@ -110,7 +110,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
@@ -30,7 +30,7 @@ index da9e749cf775fc4e3ec6846dab1f92e64f088442..6a4983999666c6b59c2c46f194190059
          this.goalSelector.addGoal(1, new TradeWithPlayerGoal(this));
          this.goalSelector.addGoal(1, new AvoidEntityGoal<>(this, Zombie.class, 8.0F, 0.5D, 0.5D));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ba7c9c9d0713a9f9c8cb785922e51fb88a9f13b5..7f1334fa04fe28a41f29a437e18f1613bd69997e 100644
+index 88dc1c60a8f5d320f635219884896e7ca50422de..9e24482e2dfe50a5503cdf20f0325320ecf79260 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -131,6 +131,7 @@ public class PurpurWorldConfig {

patches/server/0302-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch

@@ -26,7 +26,7 @@ index 01944f4684cc47f22fd448112be1a160be4dbeb9..1ae7ef3d94d4d3d8413a5419eeb9fada
          }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 3adfb90ce28ebba6e82a36894f6e625353d6d7f3..e3e5e326e04f54e2903b1e8b60e5e3ab54454736 100644
+index 2808c30b7d74f1ca73d9b98ada30a9a818deac3b..298429ba9183cb31caa54fbe6b52e3409ae9d971 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -418,6 +418,7 @@ public class PurpurWorldConfig {

patches/server/0304-Log-skipped-entity-s-position.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Log skipped entity's position
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 7aeab83714608e33c807b3d8122dd7d6c3e428d3..f2336e0915a9fb3a636d7873e1c5ce2ebf16e27a 100644
+index 2aa76b4bbeea0113d327f08f2b6962034ea390d5..f22ceffdc95224f2de8d19f501b43b266de196d4 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
 @@ -604,6 +604,12 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT

patches/server/0305-End-Crystal-Cramming.patch

@@ -17,7 +17,7 @@ index eccd32b4cdff15bee637ba6784ce92f53627467f..d542652d376a790c817e09921a432ee8
  
          // Purpur start
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index e3e5e326e04f54e2903b1e8b60e5e3ab54454736..b4483e3c03d9a96dfd2725cbcd22bca4e3e563c8 100644
+index 298429ba9183cb31caa54fbe6b52e3409ae9d971..ba6c9662d05d26d64aa8b4d66c14c4c4e873d773 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -853,6 +853,7 @@ public class PurpurWorldConfig {

patches/server/0306-Option-to-allow-beacon-effects-when-covered-by-tinte.patch

@@ -36,7 +36,7 @@ index 82e0a18ce0ce092656bde41da5a52737e1b2242a..c49175dcb7ca4469f729d3afb305fca4
                  BeaconBlockEntity.playSound(world, pos, SoundEvents.BEACON_AMBIENT);
              }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index b4483e3c03d9a96dfd2725cbcd22bca4e3e563c8..a3f9df384e5723d51177c78722e405a172bb385b 100644
+index ba6c9662d05d26d64aa8b4d66c14c4c4e873d773..7ab958c14162ce49173e62d77092d09ce8cd9b74 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -747,11 +747,13 @@ public class PurpurWorldConfig {

patches/server/0308-Config-to-remove-explosion-radius-clamp.patch

@@ -49,7 +49,7 @@ index c0d39afe5b80159ed9aaca4ddd4763d707882f2e..3c9e0cee78deeae6b47a186f1bfc47f3
          }
          // CraftBukkit end
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index de2f5ebfc48b4ea20fa8e194c1c7766d89c287de..d3eaf4c2983d16dcfed9f6b376b462d24b11be7f 100644
+index 7ab958c14162ce49173e62d77092d09ce8cd9b74..4cd080a0db99a5c36394bcf54526b96fe22a206a 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -216,6 +216,11 @@ public class PurpurWorldConfig {