Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2040c1e Player Flying Fall Damage API (#5357)
PaperMC/Paper@fa42c68 Expose pre-collision moving velocity to VehicleBlockCollisionEvent (#8457)
PaperMC/Paper@90750a6 Rework filtering spawn egg and tile entity nbt config (#6613)

gradle.properties

@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19.3-R0.1-SNAPSHOT
 
-paperCommit = 52718dba10c028a57a7a00993ed490a503ca9ecd
+paperCommit = 90750a6591cce9afda52093951ab1f4e438b64de
 
 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 9f762cf670bf5db9138e468e72e57781d8d22f54..b3e2e4a778c94137539c3bcce4a4e0f7c8b3a098 100644
+index de960716478477ce199526b8f860cfafa1541ee9..4d6933038e95f4479a920f3a68db0943c5b1e6a1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2903,4 +2903,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2920,4 +2920,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 b3e2e4a778c94137539c3bcce4a4e0f7c8b3a098..28d0c2a554ced153b508bea57cfc3ec92b85cc12 100644
+index 4d6933038e95f4479a920f3a68db0943c5b1e6a1..910689c6c76c13660dc1539b0c5384d0c69615f2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2911,5 +2911,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2928,5 +2928,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 28d0c2a554ced153b508bea57cfc3ec92b85cc12..d9afdcfebb3fa095bd82fb12d5d6836f2ed7741d 100644
+index 910689c6c76c13660dc1539b0c5384d0c69615f2..75ecd5d492ef443a7dc25205ba0796eea34e4ba7 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2930,5 +2930,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2947,5 +2947,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Reset the idle timer back to 0
       */
      void resetIdleTimer();

patches/api/0035-Flying-Fall-Damage-API.patch

@@ -1,30 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: TreyRuffy <TreyRuffy@users.noreply.github.com>
-Date: Wed, 9 Jun 2021 16:31:15 -0600
-Subject: [PATCH] Flying Fall Damage API
-
-
-diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d9afdcfebb3fa095bd82fb12d5d6836f2ed7741d..d76b996e8820e043b85fa5338a837e1a4f196e08 100644
---- a/src/main/java/org/bukkit/entity/Player.java
-+++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2951,5 +2951,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      * @param invulnerableTicks Invulnerable ticks remaining
-      */
-     void setSpawnInvulnerableTicks(int invulnerableTicks);
-+
-+    /**
-+     * Allows you to enable fall damage while {@link #getAllowFlight()} is {@code true}
-+     *
-+     * @param flyingFallDamage Enables fall damage when {@link #getAllowFlight()} is true
-+     */
-+    public void setFlyingFallDamage(boolean flyingFallDamage);
-+
-+    /**
-+     * Allows you get if fall damage is enabled while {@link #getAllowFlight()} is {@code true}
-+     *
-+     * @return True if fall damage is enabled when {@link #getAllowFlight()} is true
-+     */
-+    public boolean hasFlyingFallDamage();
-     // Purpur end
- }

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Extended OfflinePlayer API
 
 
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index a7d1f1e701f23e851f735584a30bedadb0d8b9bd..7da38adede5b752583b94f6a14b3e45d0fd10209 100644
+index 69b50eee42e8c52063033705bd23a5ef5231ed83..3578ab0c3a413d56bc39af43b5d3201d20d7d13a 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
 @@ -455,4 +455,114 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio

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

@@ -260,13 +260,13 @@ index 8effbbd33c0af0ac421e5aef1586e8579ef097e4..0cd49cb31b21e52009f6220d505aa2a3
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d76b996e8820e043b85fa5338a837e1a4f196e08..6782a41eb845c69e9749e340d9fe8d6402caecc2 100644
+index 75ecd5d492ef443a7dc25205ba0796eea34e4ba7..9246df99c4247e361eaa27ea266981b7fec0c14b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2965,5 +2965,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      * @return True if fall damage is enabled when {@link #getAllowFlight()} is true
+@@ -2968,5 +2968,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      * @param invulnerableTicks Invulnerable ticks remaining
       */
-     public boolean hasFlyingFallDamage();
+     void setSpawnInvulnerableTicks(int invulnerableTicks);
 +
 +    /**
 +     * Creates debug block highlight on specified block location and show it to this player.

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

@@ -5,10 +5,10 @@ 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 6782a41eb845c69e9749e340d9fe8d6402caecc2..faa2954f68cf5c675e732bd1c6b456321ccb2ec2 100644
+index 9246df99c4247e361eaa27ea266981b7fec0c14b..0f1d925f9c338427e3fb8cdbbcd37569fc3b30ad 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2411,6 +2411,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2428,6 +2428,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void showDemoScreen();
  

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

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

@@ -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 99bf1485ddecb5fc88850242e9c32850781c4b36..af9abcc1d46a5e88dd85f5b61d3d8cced87ecd11 100644
+index b32f44beab2c9790ee2da8403e362e8b3ecc6175..d12146a26ccdd534f43616ef8afe14f3883232c3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3003,4 +3003,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3016,4 +3016,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.spigot;
      }
      // Spigot end

patches/server/0008-Ridables.patch

@@ -87,7 +87,7 @@ index f79ca89b430636bf5c0e140499ac20f743f22f33..ebc2707fa3eeec4c80d7f186fce39ddc
                              if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
                                  entity.getEntityData().resendPossiblyDesyncedEntity(player); // Paper - The entire mob gets deleted, so resend it.
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 3961f66a23508089df8c4ee7455e170cb870e9d0..124af1198b6d52d64d7de00ff80d6a4365f940f0 100644
+index ebc7034d68a1c732ba5b89c95e79660d5505a74c..56600adaeb6b51451529469acca8ca1aef352ff3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -361,7 +361,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -5111,10 +5111,10 @@ index e92e6fb4cf97f4d5406b5b5d5786bfa5fb55f536..0e7d5540763d56020cd59d9aef09f7a7
                      this.setTradingPlayer(player);
                      this.openTradingScreen(player, this.getDisplayName(), 1);
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 0dcae10fd05a8fe963fdedda8199aa09dc717c9a..c0b27ff0381938e7348bc9e414215d6b3f5c77f1 100644
+index 61597ebe2f9faff43994c475074b87d11905e582..e0f3375653db94d5fd2e154b72cae3d2113aaab1 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -193,6 +193,19 @@ public abstract class Player extends LivingEntity {
+@@ -194,6 +194,19 @@ public abstract class Player extends LivingEntity {
      }
      // CraftBukkit end
  

patches/server/0010-Barrels-and-enderchests-6-rows.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Barrels and enderchests 6 rows
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 2e434fa0ac143c5751c8f24218ff014cdc119ef5..7a5e3bf6e593ed15e8292eefe10f588cbad3d080 100644
+index 95b1ddc0559f338e99dcacd13ee90587e9e21489..e3a430827f40c00e60256c21e2fbee1b6c1eab5e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1132,6 +1132,27 @@ public abstract class PlayerList {
@@ -37,12 +37,12 @@ index 2e434fa0ac143c5751c8f24218ff014cdc119ef5..7a5e3bf6e593ed15e8292eefe10f588c
  
      public boolean isWhiteListed(GameProfile profile) {
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 0e96ae9381abbf65182a04df28be94709ef66bb3..6bf696b7944cfaae57074eb554e7b7a021eeae2d 100644
+index e0f3375653db94d5fd2e154b72cae3d2113aaab1..aa41679dec3c87c5af8721c710adcad7cdd65f8b 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -182,6 +182,7 @@ public abstract class Player extends LivingEntity {
-     // Paper start
+@@ -183,6 +183,7 @@ public abstract class Player extends LivingEntity {
      public boolean affectsSpawning = true;
+     public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET;
      // Paper end
 +    public int sixRowEnderchestSlotCount = -1; // Purpur
  

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 d0a0c874984f628a9fe43696bbbe3ec6e981c2dd..a2a1e678d286d2d2b47b7df6318c4eef4bf64127 100644
+index ebc2707fa3eeec4c80d7f186fce39ddcbd8eb414..60dd6eb68e500d72e1189322d51d1c1fd71fe881 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
@@ -187,10 +187,10 @@ index e752c83df50fb9b670ecea2abc95426c2a009b6f..baa4f9026d31de92210300ecb8ee8c1b
              if (baseEntity == null) {
                  if (this.isCombat && (!targetEntity.canBeSeenAsEnemy() || targetEntity.level.getDifficulty() == Difficulty.PEACEFUL)) {
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 6bf696b7944cfaae57074eb554e7b7a021eeae2d..173504898e9af92d347c99db7737977a980e22c1 100644
+index aa41679dec3c87c5af8721c710adcad7cdd65f8b..46504ca6084805fd2fe7daab91b755839d10e00b 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -197,6 +197,13 @@ public abstract class Player extends LivingEntity {
+@@ -198,6 +198,13 @@ public abstract class Player extends LivingEntity {
      // Purpur start
      public abstract void resetLastActionTime();
  
@@ -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 af9abcc1d46a5e88dd85f5b61d3d8cced87ecd11..09c88f1bb2d8c629350cb21b3801767295396ea0 100644
+index d12146a26ccdd534f43616ef8afe14f3883232c3..56cf4ce045dcd9d52beee849165cad3673601b54 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 af9abcc1d46a5e88dd85f5b61d3d8cced87ecd11..09c88f1bb2d8c629350cb21b38017672
          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()));
-@@ -3009,5 +3014,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3022,5 +3027,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean usesPurpurClient() {
          return getHandle().purpurClient;
      }

patches/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerSetSpawnerTypeWithEggEvent
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
-index 4f3708f5f5dcb6af8225bda1cc9204a6d974665f..3fb94a9ceb66cbc419b0b6ceb96310c8f2877257 100644
+index 3e0d38ed6959d5d9f7dbae8d604acb9299b8621d..a6d8ac89d0b5de3475768f18dc47f99b708b4323 100644
 --- a/src/main/java/net/minecraft/world/entity/EntityType.java
 +++ b/src/main/java/net/minecraft/world/entity/EntityType.java
 @@ -308,6 +308,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
@@ -25,7 +25,7 @@ index 4f3708f5f5dcb6af8225bda1cc9204a6d974665f..3fb94a9ceb66cbc419b0b6ceb96310c8
      public static ResourceLocation getKey(EntityType<?> type) {
          return BuiltInRegistries.ENTITY_TYPE.getKey(type);
      }
-@@ -515,6 +525,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
+@@ -522,6 +532,16 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
          return this.category;
      }
  

patches/server/0018-Player-invulnerabilities.patch

@@ -82,7 +82,7 @@ index e40144aad9182ccb2ed871d74378cf0af783c9f1..8e6c0ab117f7c79e51470a1364995217
      public Scoreboard getScoreboard() {
          return this.getBukkitEntity().getScoreboard().getHandle();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index a2a1e678d286d2d2b47b7df6318c4eef4bf64127..9f86bff926434b58143522d624ea7d6e044e430d 100644
+index 60dd6eb68e500d72e1189322d51d1c1fd71fe881..e6d4bd13bb37329656e2d8931da186d384d3652f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2091,12 +2091,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -108,7 +108,7 @@ index a2a1e678d286d2d2b47b7df6318c4eef4bf64127..9f86bff926434b58143522d624ea7d6e
          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 7a5e3bf6e593ed15e8292eefe10f588cbad3d080..603d5bfd03d3dec44f627d1260dc40fc3e189f2a 100644
+index e3a430827f40c00e60256c21e2fbee1b6c1eab5e..95ae7839d7b7596f0692abb6824a172f44710b23 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -947,6 +947,8 @@ public abstract class PlayerList {
@@ -121,10 +121,10 @@ index 7a5e3bf6e593ed15e8292eefe10f588cbad3d080..603d5bfd03d3dec44f627d1260dc40fc
          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 09c88f1bb2d8c629350cb21b3801767295396ea0..f61a1326fa943b606de8f75a6b7f95b9e220047a 100644
+index 56cf4ce045dcd9d52beee849165cad3673601b54..d2bb97c72c75a5d56e1d34294717aec959779196 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3029,5 +3029,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3042,5 +3042,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleTimer() {
          getHandle().resetLastActionTime();
      }

patches/server/0056-Add-player-death-exp-control-options.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add player death exp control options
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 173504898e9af92d347c99db7737977a980e22c1..f129bb64a142f16e32f33cfa418ac498d44ad3c2 100644
+index 46504ca6084805fd2fe7daab91b755839d10e00b..940b690b5deeac168ce3b1b3374b8571bf95beab 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1969,9 +1969,18 @@ public abstract class Player extends LivingEntity {
+@@ -1970,9 +1970,18 @@ public abstract class Player extends LivingEntity {
      @Override
      public int getExperienceReward() {
          if (!this.level.getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY) && !this.isSpectator()) {

patches/server/0124-Full-netherite-armor-grants-fire-resistance.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Full netherite armor grants fire resistance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index f129bb64a142f16e32f33cfa418ac498d44ad3c2..45385fe2e5249f4a61acd09b7b7ec3932df95adc 100644
+index 940b690b5deeac168ce3b1b3374b8571bf95beab..f67965877e7963e2bd5bf8786fdd16c6610692e5 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -361,6 +361,16 @@ public abstract class Player extends LivingEntity {
+@@ -362,6 +362,16 @@ public abstract class Player extends LivingEntity {
              this.addEffect(new MobEffectInstance(MobEffects.WATER_BREATHING, 200, 0, false, false, true), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.TURTLE_HELMET); // CraftBukkit
          }
  

patches/server/0173-Add-config-change-multiplier-critical-damage-value.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add config change multiplier critical damage value
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 45385fe2e5249f4a61acd09b7b7ec3932df95adc..9e8cdcf56586351abc69bd4884d1f5fd2209cc68 100644
+index f67965877e7963e2bd5bf8786fdd16c6610692e5..da42e5d3d4409c9649db48fc90da7904ed2a1e20 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1306,7 +1306,7 @@ public abstract class Player extends LivingEntity {
+@@ -1307,7 +1307,7 @@ public abstract class Player extends LivingEntity {
                      flag2 = flag2 && !level.paperConfig().entities.behavior.disablePlayerCrits; // Paper
                      flag2 = flag2 && !this.isSprinting();
                      if (flag2) {

patches/server/0184-Flying-Fall-Damage-API.patch

@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: TreyRuffy <TreyRuffy@users.noreply.github.com>
-Date: Wed, 9 Jun 2021 16:31:14 -0600
-Subject: [PATCH] Flying Fall Damage API
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 9e8cdcf56586351abc69bd4884d1f5fd2209cc68..747e3c7abaae99e60273c75fc45a7a58d6e6c96e 100644
---- a/src/main/java/net/minecraft/world/entity/player/Player.java
-+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -183,6 +183,7 @@ public abstract class Player extends LivingEntity {
-     public boolean affectsSpawning = true;
-     // Paper end
-     public int sixRowEnderchestSlotCount = -1; // Purpur
-+    public boolean flyingFallDamage = false; // Purpur
- 
-     // CraftBukkit start
-     public boolean fauxSleeping;
-@@ -1784,7 +1785,7 @@ public abstract class Player extends LivingEntity {
- 
-     @Override
-     public boolean causeFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) {
--        if (this.abilities.mayfly) {
-+        if (this.abilities.mayfly && !flyingFallDamage) { // Purpur
-             return false;
-         } else {
-             if (fallDistance >= 2.0F) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7448c124fd155d832c999f16b4ecdbfeec8c6119..0e755918b978e708f9567171cd4473308bd50ebb 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3048,5 +3048,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-     public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
-         getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
-     }
-+
-+    public void setFlyingFallDamage(boolean flyingFallDamage) {
-+        getHandle().flyingFallDamage = flyingFallDamage;
-+    }
-+
-+    @Override
-+    public boolean hasFlyingFallDamage() {
-+        return getHandle().flyingFallDamage;
-+    }
-     // Purpur end
- }

patches/server/0185-Burp-delay-burp-after-eating-food-fills-hunger-bar-c.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Burp delay, burp after eating food fills hunger bar
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 747e3c7abaae99e60273c75fc45a7a58d6e6c96e..a3d092fb6fe5df8018af37d12cdd085041cb96fd 100644
+index da42e5d3d4409c9649db48fc90da7904ed2a1e20..daf6bf6db897ea4da18035e46f421ea2b2beba83 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -196,6 +196,8 @@ public abstract class Player extends LivingEntity {

patches/server/0186-Allow-player-join-full-server-by-permission.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow player join full server by permission
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 79578c45c23048de0fbc1d0f09efb7b39629799d..f3fc72e1ddbb65daaab3b5fe1c6210434a434050 100644
+index 6fe21f1464897543a86bffe96e386767a38ff7da..728fcabab244bb1e5731349ad75a4556266b1bc8 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -714,7 +714,7 @@ public abstract class PlayerList {

patches/server/0187-Add-permission-bypass-for-portal-waiting.patch

@@ -5,13 +5,13 @@ Subject: [PATCH] Add permission bypass for portal waiting
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index a3d092fb6fe5df8018af37d12cdd085041cb96fd..4255eb4ec520b07a9b32e967e31d0b58d359b29e 100644
+index daf6bf6db897ea4da18035e46f421ea2b2beba83..d872a97f9a0c2f81908f000963fc25ace4e5f859 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -184,6 +184,7 @@ public abstract class Player extends LivingEntity {
+     public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET;
      // Paper end
      public int sixRowEnderchestSlotCount = -1; // Purpur
-     public boolean flyingFallDamage = false; // Purpur
 +    public boolean canPortalInstant = false; // Purpur
  
      // CraftBukkit start

patches/server/0196-Structure-seed-options.patch

@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Thu, 1 Jul 2021 19:25:05 -0500
-Subject: [PATCH] Structure seed options
-
-
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 32dcd6db3c3c06d34bb4303bbaef8db648b1843d..307e8eb85e1f70ea45bc47ff80faac2db1927a61 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -217,6 +217,23 @@ public class PurpurConfig {
-         deathMessageOnlyBroadcastToAffectedPlayer = getBoolean("settings.broadcasts.death.only-broadcast-to-affected-player", deathMessageOnlyBroadcastToAffectedPlayer);
-     }
- 
-+    public static int seedStructureBuriedTreasure = -1;
-+    public static int seedStructureMineshaft = -1;
-+    private static void seedSettings() {
-+        seedStructureBuriedTreasure = getInt("settings.seed.structure.buried_treasure", seedStructureBuriedTreasure);
-+        seedStructureMineshaft = getInt("settings.seed.structure.mineshaft", seedStructureMineshaft);
-+        if (version < 26) {
-+            int stronghold = getInt("settings.seed.structure.stronghold", -1);
-+            set("settings.seed.structure.stronghold", null);
-+            if (stronghold != -1) {
-+                org.spigotmc.SpigotConfig.config.set("world-settings.default.seed-stronghold", stronghold);
-+                org.spigotmc.SpigotConfig.save();
-+            }
-+        }
-+        // hide these from timings report
-+        if (!TimingsManager.hiddenConfigs.contains("settings.seed")) TimingsManager.hiddenConfigs.add("settings.seed");
-+    }
-+
-     public static String serverModName = "Purpur";
-     private static void serverModName() {
-         serverModName = getString("settings.server-mod-name", serverModName);

patches/server/0198-Customizable-sleeping-actionbar-messages.patch

@@ -38,7 +38,7 @@ index 78d23c3b1dc891e6b64d33c1908aefee83113ce4..435c9be4e44ae273b975d35ef5ca0d82
                  }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 307e8eb85e1f70ea45bc47ff80faac2db1927a61..2236b589e8c9758d635cdae79c72dd9860efb910 100644
+index 32dcd6db3c3c06d34bb4303bbaef8db648b1843d..31f5d9bcc11dc78b0d04c55560d5a2fa18bf3896 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -185,6 +185,8 @@ public class PurpurConfig {

patches/server/0202-Player-ridable-in-water-option.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Player ridable in water option
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 4255eb4ec520b07a9b32e967e31d0b58d359b29e..46258a0218614600a5405a6c251cbec58574decf 100644
+index d872a97f9a0c2f81908f000963fc25ace4e5f859..ef71fc472f8f436e8483eb86b8dcc89125a89b18 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -2076,6 +2076,11 @@ public abstract class Player extends LivingEntity {

patches/server/0204-Add-compass-command.patch

@@ -59,10 +59,10 @@ index 4d984fc18bba2da2dd709440dbf845ee1586f677..3f642a1a6d74d80d78e06441b5076981
      // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 2236b589e8c9758d635cdae79c72dd9860efb910..5ab20a1701962af4abd3189b4072d3a9e35ba282 100644
+index 31f5d9bcc11dc78b0d04c55560d5a2fa18bf3896..42532975d8c5558a7598e759838e75f2f1cc485e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -268,6 +268,11 @@ public class PurpurConfig {
+@@ -251,6 +251,11 @@ public class PurpurConfig {
      public static String commandTPSBarTextColorMedium = "<gradient:#ffff55:#ffaa00><text></gradient>";
      public static String commandTPSBarTextColorLow = "<gradient:#ff5555:#aa0000><text></gradient>";
      public static int commandTPSBarTickInterval = 20;
@@ -74,7 +74,7 @@ index 2236b589e8c9758d635cdae79c72dd9860efb910..5ab20a1701962af4abd3189b4072d3a9
      public static boolean commandGamemodeRequiresPermission = false;
      public static boolean hideHiddenPlayersFromEntitySelector = false;
      public static String uptimeFormat = "<days><hours><minutes><seconds>";
-@@ -290,6 +295,13 @@ public class PurpurConfig {
+@@ -273,6 +278,13 @@ public class PurpurConfig {
          commandTPSBarTextColorMedium = getString("settings.command.tpsbar.text-color.medium", commandTPSBarTextColorMedium);
          commandTPSBarTextColorLow = getString("settings.command.tpsbar.text-color.low", commandTPSBarTextColorLow);
          commandTPSBarTickInterval = getInt("settings.command.tpsbar.tick-interval", commandTPSBarTickInterval);

patches/server/0205-Toggle-for-kinetic-damage.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Toggle for kinetic damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ebb6d9d2cc977e4c473bb3839c8bb03ca40ca4bb..3cbb2606abd7062d3fc3e545c5665c1fa6e3265a 100644
+index 1739e848eae0cfab56e74d5200e3f939e83da233..d5980f19074fce969bb156b7b3bf0854c02ea477 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2918,6 +2918,7 @@ public abstract class LivingEntity extends Entity {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Extended OfflinePlayer API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index 6d2ba650f53de8a460857f1846401a20b50cc43c..8ed695fd64feb3c2411ed46d9c326eb20e0a321c 100644
+index 714afc98b5150907b45a00060be4e41582333204..312a6d90c0a09570aef24c205dc2ff277dcd4279 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -549,4 +549,213 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
@@ -223,10 +223,10 @@ index 6d2ba650f53de8a460857f1846401a20b50cc43c..8ed695fd64feb3c2411ed46d9c326eb2
 +    // 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 0e755918b978e708f9567171cd4473308bd50ebb..3dcc850f02aecb1535e0310d76ff37413cc348f4 100644
+index 32e71b5bd7aae211f9e6715eaf6bd67521a79253..0d63c9e3487c5543be1783d6c220214cbb86bc35 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2219,6 +2219,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2232,6 +2232,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().getAbilities().walkingSpeed * 2f;
      }
  

patches/server/0217-Added-the-ability-to-add-combustible-items.patch

@@ -51,7 +51,7 @@ index bbff7466cecf50285c97fadaf68682a6c6ea879f..5ae858b81e6f9903b7296077cf497f62
      private int maxStack = MAX_STACK;
      public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7803c13ed23c6840c400b4f2e983ede7a0b43de0..96bfedd522b089a8607346a9e17b38bde41d1662 100644
+index ee1efc705f4ec214d4d30bb409025f8bccfaa290..cd17d6d6b871214d84d393fc9ebcc3dccff6da50 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1453,6 +1453,19 @@ public final class CraftServer implements Server {

patches/server/0220-Shift-right-click-to-use-exp-for-mending.patch

@@ -36,7 +36,7 @@ index 16f136dd8ed96a3eb7ae1cf9c6039b4f026fec25..744c936c3aa9bd7bcf43ac3d78a08ece
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 1c406f667d2dbe209d90abe80dbc6f896da6e554..aa31194b13fe0559e9a0ad1040abd9f3e5a91406 100644
+index 9077efe142b70829ab409bf6eb459fa84e5dfd5f..c35295ff180e797d7933788964a849719bfd25f1 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2086,6 +2086,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

patches/server/0225-Config-for-grindstones.patch

@@ -57,10 +57,10 @@ index 233e8626280a8b93dcb8621a1405e8c308c6836b..446b5c66f82444ac1d77a3441421d43f
      }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 5ab20a1701962af4abd3189b4072d3a9e35ba282..d975ec21330055c7b74cdcdd18bfcb3a3daf5ca8 100644
+index 42532975d8c5558a7598e759838e75f2f1cc485e..11c0c8d9a294330eb2f4147420f2bde3068a2786 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -322,6 +322,9 @@ public class PurpurConfig {
+@@ -305,6 +305,9 @@ public class PurpurConfig {
      public static int beeInsideBeeHive = 3;
      public static boolean anvilCumulativeCost = true;
      public static int lightningRodRange = 128;
@@ -70,7 +70,7 @@ index 5ab20a1701962af4abd3189b4072d3a9e35ba282..d975ec21330055c7b74cdcdd18bfcb3a
      private static void blockSettings() {
          if (version < 3) {
              boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-@@ -356,6 +359,19 @@ public class PurpurConfig {
+@@ -339,6 +342,19 @@ public class PurpurConfig {
          beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);
          anvilCumulativeCost = getBoolean("settings.blocks.anvil.cumulative-cost", anvilCumulativeCost);
          lightningRodRange = getInt("settings.blocks.lightning_rod.range", lightningRodRange);

patches/server/0226-UPnP-Port-Forwarding.patch

@@ -67,10 +67,10 @@ index f0d4e4e98148fabeb90ae6a22855ed0c8d49d08a..e5ed4f5e0b92c34a201087af1b1d68d5
          // CraftBukkit start
          // this.setPlayerList(new DedicatedPlayerList(this, this.registries(), this.playerDataStorage)); // Spigot - moved up
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index d975ec21330055c7b74cdcdd18bfcb3a3daf5ca8..4c20371d961e16657454ecec666fb51898682780 100644
+index 11c0c8d9a294330eb2f4147420f2bde3068a2786..303d647ceeec29a9133b7588156eb2c9941c7db6 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -439,4 +439,9 @@ public class PurpurConfig {
+@@ -422,4 +422,9 @@ public class PurpurConfig {
      private static void tpsCatchup() {
          tpsCatchup = getBoolean("settings.tps-catchup", tpsCatchup);
      }

patches/server/0232-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch

@@ -135,10 +135,10 @@ index e5c135ec059746b75fe58516809584221285cdbe..713c7e6e31a3e1097b612c77a4fce147
 +    // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 4c20371d961e16657454ecec666fb51898682780..921d5095c3595b457ff4028693381eeffa7a44c1 100644
+index 303d647ceeec29a9133b7588156eb2c9941c7db6..32769f726d3200478e13b5b31756d2139aac40b7 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -325,6 +325,10 @@ public class PurpurConfig {
+@@ -308,6 +308,10 @@ public class PurpurConfig {
      public static Set<Enchantment> grindstoneIgnoredEnchants = new HashSet<>();
      public static boolean grindstoneRemoveAttributes = false;
      public static boolean grindstoneRemoveDisplay = false;
@@ -149,7 +149,7 @@ index 4c20371d961e16657454ecec666fb51898682780..921d5095c3595b457ff4028693381eef
      private static void blockSettings() {
          if (version < 3) {
              boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-@@ -372,6 +376,30 @@ public class PurpurConfig {
+@@ -355,6 +359,30 @@ public class PurpurConfig {
          });
          grindstoneRemoveAttributes = getBoolean("settings.blocks.grindstone.remove-attributes", grindstoneRemoveAttributes);
          grindstoneRemoveDisplay = getBoolean("settings.blocks.grindstone.remove-name-and-lore", grindstoneRemoveDisplay);

patches/server/0233-Mobs-always-drop-experience.patch

@@ -821,7 +821,7 @@ index ec2f96b3517bd99cbd616aee56d0b1c6f6247759..1d4fed01ee94678e04962df0f086f53e
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index 51f6cdf23150402a59b4e5977850d52d07d92342..149936a7e17789024b1e0de288feac1529b15670 100644
+index f477cca8e6cf7cd5bb2f90a8cd08ae2797d3cd38..a68c701c1ca448d64154852094704532a1b96445 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 @@ -100,6 +100,11 @@ public class Ravager extends Raider {
@@ -901,7 +901,7 @@ index f0443eb69ba4bf6c574f3af6f69ac5f0fe168506..360ad0ffd25c5d42d8d50060be40cab3
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Spider.java b/src/main/java/net/minecraft/world/entity/monster/Spider.java
-index 4e40f37d1afd97bd3cd44179afbe4dc010d24d74..b1f23e67f7f21cb9a85301a819e8079d9000c0f6 100644
+index f0667d8cf99d295dae330d8e0e54514231915e8c..1f0ab16f718f2d499187949c5a25819120fe86f5 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
 @@ -76,6 +76,11 @@ public class Spider extends Monster {
@@ -1077,7 +1077,7 @@ index 45ed7baaf5cbb3c368bc0051462bfba35c5d6726..ab33a30995d741898cd034fe0fad99ef
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-index 68cb79ad43a11195eb2245f6d9081212c7adb0dd..9d65b412e30f528d378de9072b48632c56c3e5bb 100644
+index af2febb6b5d9668eb384466bdaff1b425f00f139..73c7c1658eea207e9775b7be3180a7a47f683dfe 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 @@ -97,6 +97,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {

patches/server/0240-Configurable-valid-characters-for-usernames.patch

@@ -18,10 +18,10 @@ index ab1443048b3a4292be45b253c24eccf0de8b364d..f7f085a2dc5dc8d09bc665a371afac04
              char c = in.charAt(i);
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 921d5095c3595b457ff4028693381eeffa7a44c1..d100bc3caab4fd2e03cf199a225c6a95930dd9f8 100644
+index 32769f726d3200478e13b5b31756d2139aac40b7..0394e3150daebc8e63165faafb8362ce7a0d8641 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -472,4 +472,11 @@ public class PurpurConfig {
+@@ -455,4 +455,11 @@ public class PurpurConfig {
      private static void networkSettings() {
          useUPnP = getBoolean("settings.network.upnp-port-forwarding", useUPnP);
      }

patches/server/0241-Shears-can-have-looting-enchantment.patch

@@ -158,10 +158,10 @@ index 6b8a1535086aae7e4e3229d05615fb903188f507..60af917083de1b790b1d93d61835a669
      public int getMinCost(int level) {
          return 15 + (level - 1) * 9;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index d100bc3caab4fd2e03cf199a225c6a95930dd9f8..a647503bea048857190c536904a01f68b69871a8 100644
+index 0394e3150daebc8e63165faafb8362ce7a0d8641..aebd8ac1a50d88d08447b9cbc0dbed0676abfb8e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -404,6 +404,7 @@ public class PurpurConfig {
+@@ -387,6 +387,7 @@ public class PurpurConfig {
  
      public static boolean allowInfinityMending = false;
      public static boolean allowCrossbowInfinity = false;
@@ -169,7 +169,7 @@ index d100bc3caab4fd2e03cf199a225c6a95930dd9f8..a647503bea048857190c536904a01f68
      public static boolean allowUnsafeEnchants = false;
      public static boolean allowInapplicableEnchants = true;
      public static boolean allowIncompatibleEnchants = true;
-@@ -425,6 +426,7 @@ public class PurpurConfig {
+@@ -408,6 +409,7 @@ public class PurpurConfig {
          }
          allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending);
          allowCrossbowInfinity = getBoolean("settings.enchantment.allow-infinity-on-crossbow", allowCrossbowInfinity);

patches/server/0245-Configurable-player-pickup-exp-delay.patch

@@ -24,7 +24,7 @@ index e3148983e1bf6f7c972a5794d99c03f7061d21a0..a1d271c931cf35f6a73191a1c21933ab
                  int i = this.repairPlayerItems(player, this.value);
  
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 3d549570d83f06952022954b15810a54a2acd234..70b9cbdc4972d9f1e23fda1615ecfc6c71091728 100644
+index ef71fc472f8f436e8483eb86b8dcc89125a89b18..a667401600fc47efa9efa2964ea4099cddc7167a 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -626,7 +626,7 @@ public abstract class Player extends LivingEntity {