diff --git a/patches/api/0005-Purpur-client-support.patch b/patches/api/0005-Purpur-client-support.patch
index 0c2e9991d..f7647de1d 100644
--- a/patches/api/0005-Purpur-client-support.patch
+++ b/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 c68df5e5cc63b26da8623cf27e257ef07a61897d..ee238e894b10bf089fa3be496a81bcb647aa8100 100644
+index b0bd8194d263f6986e80b7d9848297a2bf27a112..ce1dfcef1a82e63b8dd53a8f278b601958c2e8e8 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2946,4 +2946,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2971,4 +2971,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end
diff --git a/patches/api/0010-AFK-API.patch b/patches/api/0010-AFK-API.patch
index 3cdb36964..e0ed083c0 100644
--- a/patches/api/0010-AFK-API.patch
+++ b/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 ee238e894b10bf089fa3be496a81bcb647aa8100..0416b3de7a2e439891aa7b8c2c7536d7f4096026 100644
+index ce1dfcef1a82e63b8dd53a8f278b601958c2e8e8..f4d31bd1301e7e38f46be6b93c6021169c8eca75 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2954,5 +2954,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2979,5 +2979,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @return True if Player uses Purpur Client
       */
      public boolean usesPurpurClient();
diff --git a/patches/api/0013-LivingEntity-safeFallDistance.patch b/patches/api/0013-LivingEntity-safeFallDistance.patch
index 4b06db9a4..1fde53a55 100644
--- a/patches/api/0013-LivingEntity-safeFallDistance.patch
+++ b/patches/api/0013-LivingEntity-safeFallDistance.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity safeFallDistance
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index ead90b002034c463983af948a4fb882109b8d3a2..cb45f3ae2b13ec13e02a931dd870e86c5eabf6c9 100644
+index 6555397148b84dba7a87cae505544b65452f1742..3aee8f29fece72485eb9ada371d6444633120a53 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1107,4 +1107,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1126,4 +1126,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      void damageItemStack(org.bukkit.inventory.@NotNull EquipmentSlot slot, int amount);
      // Paper end
diff --git a/patches/api/0017-Player-invulnerabilities.patch b/patches/api/0017-Player-invulnerabilities.patch
index 3a80b6e70..ee3db0ac3 100644
--- a/patches/api/0017-Player-invulnerabilities.patch
+++ b/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 0416b3de7a2e439891aa7b8c2c7536d7f4096026..2ab176269dea6035fd778640430f4f0fd499dd3b 100644
+index f4d31bd1301e7e38f46be6b93c6021169c8eca75..b269df50f3913d40646cfc597d78851ed0c0acb4 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2973,5 +2973,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2998,5 +2998,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Reset the idle timer back to 0
       */
      void resetIdleTimer();
diff --git a/patches/api/0022-LivingEntity-broadcastItemBreak.patch b/patches/api/0022-LivingEntity-broadcastItemBreak.patch
index 165b859fc..cccf14312 100644
--- a/patches/api/0022-LivingEntity-broadcastItemBreak.patch
+++ b/patches/api/0022-LivingEntity-broadcastItemBreak.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index cb45f3ae2b13ec13e02a931dd870e86c5eabf6c9..a4fbc1f6f71759ed9e11b4487aff04961946b7d8 100644
+index 3aee8f29fece72485eb9ada371d6444633120a53..7f828209e0323475ec51e44975e3b3ac10aa265b 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1122,5 +1122,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1141,5 +1141,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param safeFallDistance Safe fall distance
       */
      void setSafeFallDistance(float safeFallDistance);
diff --git a/patches/api/0034-API-for-any-mob-to-burn-daylight.patch b/patches/api/0034-API-for-any-mob-to-burn-daylight.patch
index b2fa8a914..5d923bc90 100644
--- a/patches/api/0034-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/api/0034-API-for-any-mob-to-burn-daylight.patch
@@ -23,10 +23,10 @@ index 56afcc92854897ad5c971e576f96414bae766b7a..d8f30fca0b5b9673c5dd8a78e87a378c
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index a4fbc1f6f71759ed9e11b4487aff04961946b7d8..d1379d8eee19bcef3b9ffa7c86961f9ce57f76ad 100644
+index 7f828209e0323475ec51e44975e3b3ac10aa265b..ebc42a0ed4b24564a5055fef50468142529aed2f 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1129,5 +1129,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1148,5 +1148,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param slot Equipment slot to play break animation for
       */
      void broadcastItemBreak(@NotNull org.bukkit.inventory.EquipmentSlot slot);
diff --git a/patches/api/0046-Add-local-difficulty-api.patch b/patches/api/0046-Add-local-difficulty-api.patch
index d761cc37f..aa53d8478 100644
--- a/patches/api/0046-Add-local-difficulty-api.patch
+++ b/patches/api/0046-Add-local-difficulty-api.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add local difficulty api
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 9e71e519cda72a1e2a01474f238b97015ec5115e..8effbbd33c0af0ac421e5aef1586e8579ef097e4 100644
+index aa04d7df70d99402c91e920fd693d7d4fb655786..bb249f7d54fd90d63f609eedf0bbb463f1aa96f1 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -3985,6 +3985,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4010,6 +4010,16 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @Nullable
      public DragonBattle getEnderDragonBattle();
  
diff --git a/patches/api/0049-Debug-Marker-API.patch b/patches/api/0049-Debug-Marker-API.patch
index 15ddf29e1..8a9ba5c69 100644
--- a/patches/api/0049-Debug-Marker-API.patch
+++ b/patches/api/0049-Debug-Marker-API.patch
@@ -179,10 +179,10 @@ index 2b64836fcfd22c7b11030aca4de44784440e285b..e0f69edf603c2ec99bc92b16b1891227
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 8effbbd33c0af0ac421e5aef1586e8579ef097e4..0cd49cb31b21e52009f6220d505aa2a3713381b3 100644
+index bb249f7d54fd90d63f609eedf0bbb463f1aa96f1..a38863ebd363f54994753937a10e041076846af0 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -3993,6 +3993,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4018,6 +4018,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
       * @return The local difficulty
       */
      public float getLocalDifficultyAt(@NotNull Location location);
@@ -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 2ab176269dea6035fd778640430f4f0fd499dd3b..b4b4d49de4edd13d9e0f24b8042ce6103e5b0466 100644
+index b269df50f3913d40646cfc597d78851ed0c0acb4..b51589a741ee529113c42529df1d3551afd606ef 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2994,5 +2994,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3019,5 +3019,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param invulnerableTicks Invulnerable ticks remaining
       */
      void setSpawnInvulnerableTicks(int invulnerableTicks);
diff --git a/patches/api/0050-Add-death-screen-API.patch b/patches/api/0050-Add-death-screen-API.patch
index 40a83187f..b4e8dadaa 100644
--- a/patches/api/0050-Add-death-screen-API.patch
+++ b/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 b4b4d49de4edd13d9e0f24b8042ce6103e5b0466..b50a378f6de813a51ea57fced46d1df8eca6609a 100644
+index b51589a741ee529113c42529df1d3551afd606ef..46dd9980b4ef09153c1ad9cbf447e7089ecfa6ac 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3064,5 +3064,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3089,5 +3089,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Clears all debug block highlights
       */
      void clearBlockHighlights();
diff --git a/patches/server/0003-Rebrand.patch b/patches/server/0003-Rebrand.patch
index 33b52e552..bf6d9d5e6 100644
--- a/patches/server/0003-Rebrand.patch
+++ b/patches/server/0003-Rebrand.patch
@@ -252,10 +252,10 @@ index 4e56018b64d11f76c8da43fd8f85c6de72204e36..aa8212432825db65cf485cd93f734ccd
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 09da9d3c85e36c2a78663f58a97963dbc795a367..e1b873404c5f58ea678b12a762f98fb62a1c4ab7 100644
+index f2a7a10df4c283ef3d7e44121c074156556c9cf2..4439b42c97bef076efa8ec99da382414d3c522dc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -877,7 +877,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -883,7 +883,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
              return EntityCategory.WATER;
          }
  
@@ -278,7 +278,7 @@ index cdefb2025eedea7e204d70d568adaf1c1ec4c03c..d1526ed7197b883e1d1f07baf285bf5e
                  // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index a3c6b3dd87022e2def1f12da7c44c8d529191d1e..51c96095cf7092125f79a197f797dc7965647574 100644
+index 637564f7b662d8b86772f5ba96c0cb6bc6c5fa43..99ecf59b25e67b9203ed35fefc96879e40875c59 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -433,7 +433,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0005-Purpur-client-support.patch b/patches/server/0005-Purpur-client-support.patch
index 42f2ac53c..c756a9f51 100644
--- a/patches/server/0005-Purpur-client-support.patch
+++ b/patches/server/0005-Purpur-client-support.patch
@@ -43,10 +43,10 @@ index a50af1f62661622f4a162c7dbad4e7ff056a64ef..6ca749d957ff04f9c6e48271da0046a3
              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 7c43de6ad6bd7259c6bcb2a55e312e8abfcf546b..a67b1164f44e731c6651055c6bb40cee7769d78b 100644
+index 616d0c3b72c7a5fcc67981c1919a4dece904d017..550fef6ccf5319dfe4206bfe1dd01fcd56ac659d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3029,4 +3029,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3042,4 +3042,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.spigot;
      }
      // Spigot end
diff --git a/patches/server/0012-AFK-API.patch b/patches/server/0012-AFK-API.patch
index ffba77623..64b7b6d0c 100644
--- a/patches/server/0012-AFK-API.patch
+++ b/patches/server/0012-AFK-API.patch
@@ -187,7 +187,7 @@ 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 aa41679dec3c87c5af8721c710adcad7cdd65f8b..46504ca6084805fd2fe7daab91b755839d10e00b 100644
+index 67029969f5bb644909a7114694e7665fd2b32ced..bf89ac6162549cc50356e7f015abd8a2670a316c 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -198,6 +198,13 @@ public abstract class Player extends LivingEntity {
@@ -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 a67b1164f44e731c6651055c6bb40cee7769d78b..498fc20c89142448d72433774e2201cca183c936 100644
+index 550fef6ccf5319dfe4206bfe1dd01fcd56ac659d..7a0e39158223ce3c8df8ae8faf8ea86aab7a4d54 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 a67b1164f44e731c6651055c6bb40cee7769d78b..498fc20c89142448d72433774e2201cc
          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()));
-@@ -3035,5 +3040,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3048,5 +3053,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean usesPurpurClient() {
          return getHandle().purpurClient;
      }
diff --git a/patches/server/0015-LivingEntity-safeFallDistance.patch b/patches/server/0015-LivingEntity-safeFallDistance.patch
index bb8dcf9fa..392fb4989 100644
--- a/patches/server/0015-LivingEntity-safeFallDistance.patch
+++ b/patches/server/0015-LivingEntity-safeFallDistance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity safeFallDistance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 60d8052390a3a6fde05fb19896f8b8047f2c9178..38352df039574b7fec428ab910e484a7f267bfbe 100644
+index 82a8fddc5a0ee82c8ce78c02f4ecb106b89c734d..b528a65b8b03d795b703b839fc695249a12642a7 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -256,6 +256,7 @@ public abstract class LivingEntity extends Entity {
@@ -62,10 +62,10 @@ index 8b1942b396606f0c989645a6ac587fbdd26a3dc5..c1c5e884f00398032196ee71b55b348f
  
      // Purpur start
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index e1b873404c5f58ea678b12a762f98fb62a1c4ab7..dd12931ac3b3cbb27a6ead1f8399631fb8be1780 100644
+index 4439b42c97bef076efa8ec99da382414d3c522dc..97775b773a70431071bf3599d6556ab82f1f3a1f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1054,4 +1054,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1060,4 +1060,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          getHandle().knockback(strength, directionX, directionZ);
      };
      // Paper end
diff --git a/patches/server/0018-Player-invulnerabilities.patch b/patches/server/0018-Player-invulnerabilities.patch
index 25bf7b0a0..2d67055a6 100644
--- a/patches/server/0018-Player-invulnerabilities.patch
+++ b/patches/server/0018-Player-invulnerabilities.patch
@@ -121,10 +121,10 @@ index c8dedd2bfcc633ac1be891c8016dc9384e199796..0e09db289dadb812faf6850d6cbaf202
          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 498fc20c89142448d72433774e2201cca183c936..e173e0c98862353cd333ebeaa0293bf86529b6e4 100644
+index 7a0e39158223ce3c8df8ae8faf8ea86aab7a4d54..f157474b26ffea3c9ec5aa3f5c8a5f3c786a6bb5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3055,5 +3055,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3068,5 +3068,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleTimer() {
          getHandle().resetLastActionTime();
      }
diff --git a/patches/server/0091-LivingEntity-broadcastItemBreak.patch b/patches/server/0091-LivingEntity-broadcastItemBreak.patch
index b78220593..ebf73c9be 100644
--- a/patches/server/0091-LivingEntity-broadcastItemBreak.patch
+++ b/patches/server/0091-LivingEntity-broadcastItemBreak.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index dd12931ac3b3cbb27a6ead1f8399631fb8be1780..082510cfd3c371a55c19e633db4184fc9c5ee309 100644
+index 97775b773a70431071bf3599d6556ab82f1f3a1f..ce9e00d45a7b090fae5201a768fe587fb6d959de 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1065,5 +1065,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1071,5 +1071,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setSafeFallDistance(float safeFallDistance) {
          getHandle().safeFallDistance = safeFallDistance;
      }
diff --git a/patches/server/0128-Add-EntityTeleportHinderedEvent.patch b/patches/server/0128-Add-EntityTeleportHinderedEvent.patch
index 65c068806..2139e18a0 100644
--- a/patches/server/0128-Add-EntityTeleportHinderedEvent.patch
+++ b/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 e173e0c98862353cd333ebeaa0293bf86529b6e4..bbfd1f9a35b0ae0a960b2cedbf92a8239b90fefa 100644
+index f157474b26ffea3c9ec5aa3f5c8a5f3c786a6bb5..e9dd10fcf1db1204f905ebeecfa0fccb83717205 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1281,6 +1281,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1294,6 +1294,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
          if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API
diff --git a/patches/server/0179-API-for-any-mob-to-burn-daylight.patch b/patches/server/0179-API-for-any-mob-to-burn-daylight.patch
index 08d896a13..20dc8d812 100644
--- a/patches/server/0179-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/server/0179-API-for-any-mob-to-burn-daylight.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] API for any mob to burn daylight
 Co-authored by: Encode42 <me@encode42.dev>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 018ba3fbe599c1c5b892b7bead5d3d4dad8386a8..3ca3fcbf65511fa8513c88a6b02a12f20444a505 100644
+index fbc2ecdacde38efd488895b0ae1ba8caff647cb2..3891bdafc9dc1da0beeb9a9bb2c7b1149d84c5bd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4718,5 +4718,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -31,7 +31,7 @@ index 018ba3fbe599c1c5b892b7bead5d3d4dad8386a8..3ca3fcbf65511fa8513c88a6b02a12f2
      // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index a21b7c49163d205e807da1d2ae0007b89b7c0d2e..1739e848eae0cfab56e74d5200e3f939e83da233 100644
+index 4630ea33547f07839adfc6af32975161149adf17..c9537bf9b98b0f0cd0c45ef4738ad8a9ea329638 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -266,6 +266,7 @@ public abstract class LivingEntity extends Entity {
@@ -91,7 +91,7 @@ index a21b7c49163d205e807da1d2ae0007b89b7c0d2e..1739e848eae0cfab56e74d5200e3f939
  
      public boolean isSensitiveToWater() {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index bbb8af6885d465a2a3882e362b2583539f547876..535b13206e4a8a68e1fb226b3c44890face3b55f 100644
+index 57c1f778c0a10bcac251b2167b20481b3ec26234..af1c7af8e750ce62ac07fdce5f6915e997431e8c 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1711,17 +1711,7 @@ public abstract class Mob extends LivingEntity {
@@ -367,10 +367,10 @@ index 39ae7bdac23601c567013799375bf32b96d4e1fd..62ef6f620608f9b1147f525f5cc1540f
          /*
           * Order is *EXTREMELY* important -- keep it right! =D
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 082510cfd3c371a55c19e633db4184fc9c5ee309..a0605955b7f3a24372dfa2c0ea6e94c47f5921eb 100644
+index ce9e00d45a7b090fae5201a768fe587fb6d959de..e21a20d1c4c5c40ed96fc3226dd3accceb19ebe6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1071,5 +1071,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1077,5 +1077,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          if (slot == null) return;
          getHandle().broadcastBreakEvent(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
      }
diff --git a/patches/server/0216-Extended-OfflinePlayer-API.patch b/patches/server/0216-Extended-OfflinePlayer-API.patch
index e552c9a95..87d7f6eee 100644
--- a/patches/server/0216-Extended-OfflinePlayer-API.patch
+++ b/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 bbfd1f9a35b0ae0a960b2cedbf92a8239b90fefa..440dd0a91077776267943fe13fedbfc405c5a886 100644
+index e9dd10fcf1db1204f905ebeecfa0fccb83717205..ff3ff7fb1aaacba3e2551666dcd1b385a526bdce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2245,6 +2245,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2258,6 +2258,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().getAbilities().walkingSpeed * 2f;
      }
  
diff --git a/patches/server/0234-Potion-NamespacedKey.patch b/patches/server/0234-Potion-NamespacedKey.patch
index bd5605023..a3ab09cab 100644
--- a/patches/server/0234-Potion-NamespacedKey.patch
+++ b/patches/server/0234-Potion-NamespacedKey.patch
@@ -160,10 +160,10 @@ index 038ba61e4845a4a71bb78ba388ed249d19529b78..6d5080ba244daf3b93d61d28ee0b88eb
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index a0605955b7f3a24372dfa2c0ea6e94c47f5921eb..c041a5ddeac82548c3277e75c139f367dc81e71b 100644
+index e21a20d1c4c5c40ed96fc3226dd3accceb19ebe6..c189c465f5e1266d51e4d674d56fbbe61f1c5a7e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -449,7 +449,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -455,7 +455,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
  
      @Override
      public boolean addPotionEffect(PotionEffect effect, boolean force) {
@@ -172,7 +172,7 @@ index a0605955b7f3a24372dfa2c0ea6e94c47f5921eb..c041a5ddeac82548c3277e75c139f367
          return true;
      }
  
-@@ -470,7 +470,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -476,7 +476,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      @Override
      public PotionEffect getPotionEffect(PotionEffectType type) {
          MobEffectInstance handle = this.getHandle().getEffect(MobEffect.byId(type.getId()));
@@ -181,7 +181,7 @@ index a0605955b7f3a24372dfa2c0ea6e94c47f5921eb..c041a5ddeac82548c3277e75c139f367
      }
  
      @Override
-@@ -482,7 +482,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -488,7 +488,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public Collection<PotionEffect> getActivePotionEffects() {
          List<PotionEffect> effects = new ArrayList<PotionEffect>();
          for (MobEffectInstance handle : this.getHandle().activeEffects.values()) {
diff --git a/patches/server/0256-Config-for-mob-last-hurt-by-player-time.patch b/patches/server/0256-Config-for-mob-last-hurt-by-player-time.patch
index 965119621..dfbf6d17a 100644
--- a/patches/server/0256-Config-for-mob-last-hurt-by-player-time.patch
+++ b/patches/server/0256-Config-for-mob-last-hurt-by-player-time.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Config for mob last hurt by player time
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index c41afa080aae9939160cda2fdd8d01a415c61dcd..a1ef049460b1b8a257e09b52b7385fc6555f6472 100644
+index 7fc6a47dd0ded34c74c8aca3091a1d1e38cb2aa5..b9917a872b6a2231ead62c8a1c4e4eeb79a227ab 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -1460,13 +1460,13 @@ public abstract class LivingEntity extends Entity {
@@ -25,10 +25,10 @@ index c41afa080aae9939160cda2fdd8d01a415c61dcd..a1ef049460b1b8a257e09b52b7385fc6
  
                          if (entityliving1 != null && entityliving1.getType() == EntityType.PLAYER) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index c041a5ddeac82548c3277e75c139f367dc81e71b..ddec0b7470e5a925ad6247970269f3654792ab25 100644
+index c189c465f5e1266d51e4d674d56fbbe61f1c5a7e..ce333ed345420d11102776cab36462adff5f2b8c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -438,7 +438,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -444,7 +444,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          net.minecraft.server.level.ServerPlayer entityPlayer = killer == null ? null : ((CraftPlayer) killer).getHandle();
          getHandle().lastHurtByPlayer = entityPlayer;
          getHandle().lastHurtByMob = entityPlayer;
@@ -38,7 +38,7 @@ index c041a5ddeac82548c3277e75c139f367dc81e71b..ddec0b7470e5a925ad6247970269f365
      // Paper end
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 4a1078f82b586840a2dbbdb81568a88e30ddeeb3..d284e00ae2ac02204e241cfdb2a271be06872484 100644
+index 4a76a69cf4ab58eaf2b98175b8e1f5ea9aadc2f6..cb22c123c63b9816c38f53fd72248a5964a154f6 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -145,6 +145,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0272-Add-local-difficulty-api.patch b/patches/server/0272-Add-local-difficulty-api.patch
index efebfcfac..be178ef91 100644
--- a/patches/server/0272-Add-local-difficulty-api.patch
+++ b/patches/server/0272-Add-local-difficulty-api.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add local difficulty api
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f8d321e925bf2708e51590542325c1bdc67d5964..fcc6ac180a74daffa173866be3dd97a3ad63ebd7 100644
+index 54932d92b13b890b07f827c5f09bd137383d4ab5..ba570a518f2bcdb23fd2118663c2b82e7484629d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2237,6 +2237,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2253,6 +2253,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return (this.getHandle().dragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().dragonFight());
      }
  
diff --git a/patches/server/0282-Debug-Marker-API.patch b/patches/server/0282-Debug-Marker-API.patch
index 1bb3254e8..915661ce7 100644
--- a/patches/server/0282-Debug-Marker-API.patch
+++ b/patches/server/0282-Debug-Marker-API.patch
@@ -52,10 +52,10 @@ index 4612962d46b2c39f4fd8afd3953eba7b2b807625..0f0a1c1730cdcddc05b0d04411d79c54
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index fcc6ac180a74daffa173866be3dd97a3ad63ebd7..804f81c478c09a5b6d0b10a78dc2b7ae0b88cc18 100644
+index ba570a518f2bcdb23fd2118663c2b82e7484629d..9b5323edd99848b73ea0e34230e7bec8dc23be8c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2241,6 +2241,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2257,6 +2257,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
      public float getLocalDifficultyAt(Location location) {
          return getHandle().getCurrentDifficultyAt(io.papermc.paper.util.MCUtil.toBlockPosition(location)).getEffectiveDifficulty();
      }
@@ -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 440dd0a91077776267943fe13fedbfc405c5a886..1a3f35120ac9550bb594c7d400009bd1a06a0b6d 100644
+index ff3ff7fb1aaacba3e2551666dcd1b385a526bdce..fbdebd237d31e3dda3923c1a1e132bb149056b66 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3096,5 +3096,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3109,5 +3109,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
          getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
      }
diff --git a/patches/server/0287-Add-death-screen-API.patch b/patches/server/0287-Add-death-screen-API.patch
index b035127a9..83af3d7f5 100644
--- a/patches/server/0287-Add-death-screen-API.patch
+++ b/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 1a3f35120ac9550bb594c7d400009bd1a06a0b6d..5a76c967e2d9c9c1b09e8de33fcde34e25b4646b 100644
+index fbdebd237d31e3dda3923c1a1e132bb149056b66..d6c62a30d5e046ece4c13cb820037840100b78ef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3139,5 +3139,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3152,5 +3152,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())));
      }