diff --git a/gradle.properties b/gradle.properties
index b0103d07b..ee4485b35 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19.1-R0.1-SNAPSHOT
 
-paperCommit = 65f0b2e2e490448da8c4a8af88e620a02a0797a1
+paperCommit = 532dc51d5f4deb036474e8d5921275f937e4c4ac
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/api/0005-Purpur-client-support.patch b/patches/api/0005-Purpur-client-support.patch
index 3452f9b9c..4c25ac3da 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 3fcfe8651a9c422fa9c8ff77556477f1461424cf..5af23f20d2374ed47d32d74ca86b8919a43cfb2d 100644
+index b607c229cfb1e95b17b6a0073380089ef5e1b675..a6c229744a57353a21d75cec28f94cb7436b6493 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2777,4 +2777,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2796,4 +2796,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 98db2817d..9bbb0137d 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 5af23f20d2374ed47d32d74ca86b8919a43cfb2d..d2bc1d346a276cd6aea6024898074f6b0fec3595 100644
+index a6c229744a57353a21d75cec28f94cb7436b6493..0e56a15484e1ed4d75e1cf8793ce80cc9a621451 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2785,5 +2785,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2804,5 +2804,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @return True if Player uses Purpur Client
       */
      public boolean usesPurpurClient();
diff --git a/patches/api/0017-Player-invulnerabilities.patch b/patches/api/0017-Player-invulnerabilities.patch
index d49889917..884c12fac 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 d2bc1d346a276cd6aea6024898074f6b0fec3595..057b5e62919f47d698a7650aedac23316ec51094 100644
+index 0e56a15484e1ed4d75e1cf8793ce80cc9a621451..6e7be19da424b16b8540d28a24c1eed87aa72607 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2804,5 +2804,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2823,5 +2823,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Reset the idle timer back to 0
       */
      void resetIdleTimer();
diff --git a/patches/api/0035-Flying-Fall-Damage-API.patch b/patches/api/0035-Flying-Fall-Damage-API.patch
index 27fc7a513..fcdd6c608 100644
--- a/patches/api/0035-Flying-Fall-Damage-API.patch
+++ b/patches/api/0035-Flying-Fall-Damage-API.patch
@@ -5,10 +5,10 @@ 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 057b5e62919f47d698a7650aedac23316ec51094..4766ebb24bdf02a045e2e8aba18b8ae314a0e201 100644
+index 6e7be19da424b16b8540d28a24c1eed87aa72607..b3dbcca5efbc315d671b8ae260824620d97e5f52 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2825,5 +2825,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2844,5 +2844,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param invulnerableTicks Invulnerable ticks remaining
       */
      void setSpawnInvulnerableTicks(int invulnerableTicks);
diff --git a/patches/api/0051-Debug-Marker-API.patch b/patches/api/0051-Debug-Marker-API.patch
index aa0cfa156..f4c7b2d40 100644
--- a/patches/api/0051-Debug-Marker-API.patch
+++ b/patches/api/0051-Debug-Marker-API.patch
@@ -260,10 +260,10 @@ index 3d053490dc87724f57893a553f1ab9cf1a3b73c0..ec8c098ee07ac88c023ec6274788c94a
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 4766ebb24bdf02a045e2e8aba18b8ae314a0e201..6a99736f059a9034cd93e84a170f80e6168ea275 100644
+index b3dbcca5efbc315d671b8ae260824620d97e5f52..5e06858d68f725508e0055de3f5d8c0f6a56601b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2839,5 +2839,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2858,5 +2858,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @return True if fall damage is enabled when {@link #getAllowFlight()} is true
       */
      public boolean hasFlyingFallDamage();
diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch
index f59cba2c9..ad1ff46d4 100644
--- a/patches/server/0001-Pufferfish-Server-Changes.patch
+++ b/patches/server/0001-Pufferfish-Server-Changes.patch
@@ -3178,7 +3178,7 @@ index 083349794d5ceb50322c5a645dd33fbfcc1c8155..f58873ef4362bfcc618ead099be94ba2
              this.getRandomBlockPosition(j, 0, k, 15, blockposition);
              int normalY = chunk.getHeight(Heightmap.Types.MOTION_BLOCKING, blockposition.getX() & 15, blockposition.getZ() & 15) + 1;
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index adb9cde74295830e74241e522ae5766d436aadb1..86c91ba9ddf1042f832c7a7379533040624fff44 100644
+index ff7df8026f85b7ad51458a0b720a8baf71cd9bd1..32ef30e130c7f6e252ebf5b866fb9e89d7c0d7db 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1215,6 +1215,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -4704,7 +4704,7 @@ index 468c635d31cfa8051666bbefce8df4b448e9ed93..17e869074b8cf29a8c3280499a27e951
          final String id;
          private final GameRules.Category category;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 9467ccaa1d73e1913495a46919aee530e749977d..a2a0bc4874a031c964a5cdb5bc26494cd01351eb 100644
+index 5a2a1d394852d39ea576624586f7fa736dec807c..0681a7499755b573c191804b38ac8783eb7d0f32 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -271,6 +271,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -5690,7 +5690,7 @@ index 774556a62eb240da42e84db4502e2ed43495be17..80553face9c70c2a3d897681e7761df8
  
          if (stream != null) {
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 1a1a1f4d0ac025daccc2d3f84faf6592819f4d5c..8643df8d81714edf60eebd6984bac2c933d1fbd6 100644
+index 40b382c2e0e33fe5c24a51b211cd2f9557a60c5e..70b5b307193dc288a6257d90ca96762cb4a8345a 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -38,6 +38,10 @@ import co.aikar.timings.MinecraftTimings;
@@ -5704,7 +5704,7 @@ index 1a1a1f4d0ac025daccc2d3f84faf6592819f4d5c..8643df8d81714edf60eebd6984bac2c9
  
  public class ActivationRange
  {
-@@ -215,6 +219,21 @@ public class ActivationRange
+@@ -216,6 +220,21 @@ public class ActivationRange
              for (int i = 0; i < entities.size(); i++) {
                  Entity entity = entities.get(i);
                  ActivationRange.activateEntity(entity);
@@ -5726,7 +5726,7 @@ index 1a1a1f4d0ac025daccc2d3f84faf6592819f4d5c..8643df8d81714edf60eebd6984bac2c9
              }
              // Paper end
          }
-@@ -231,12 +250,12 @@ public class ActivationRange
+@@ -232,12 +251,12 @@ public class ActivationRange
          if ( MinecraftServer.currentTick > entity.activatedTick )
          {
              if ( entity.defaultActivationState )
@@ -5741,7 +5741,7 @@ index 1a1a1f4d0ac025daccc2d3f84faf6592819f4d5c..8643df8d81714edf60eebd6984bac2c9
                  entity.activatedTick = MinecraftServer.currentTick;
              }
          }
-@@ -290,7 +309,7 @@ public class ActivationRange
+@@ -291,7 +310,7 @@ public class ActivationRange
          if ( entity instanceof LivingEntity )
          {
              LivingEntity living = (LivingEntity) entity;
diff --git a/patches/server/0005-Purpur-client-support.patch b/patches/server/0005-Purpur-client-support.patch
index 9fe3db0a7..f398c6b0e 100644
--- a/patches/server/0005-Purpur-client-support.patch
+++ b/patches/server/0005-Purpur-client-support.patch
@@ -43,10 +43,10 @@ index 32ef30e130c7f6e252ebf5b866fb9e89d7c0d7db..2c9ab0cd801b6c95c9263960a7234a5e
              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 9f34358dfcb95104c5bb9e63fbe295e6e049a55d..f5e2a82f279e8c91b736410147d5e8476f3da128 100644
+index ef9c3a7b15a4901e1662e6d55504b9cbbb804ad3..a20e1a533e9f764fbf00e768fd8286c8f7868a78 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2881,4 +2881,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2897,4 +2897,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.spigot;
      }
      // Spigot end
diff --git a/patches/server/0013-AFK-API.patch b/patches/server/0013-AFK-API.patch
index 338bd4bdf..7c12bff42 100644
--- a/patches/server/0013-AFK-API.patch
+++ b/patches/server/0013-AFK-API.patch
@@ -68,7 +68,7 @@ index 8c18c203854628c0dd8d660b197127b019fec971..f2e84f02ee8c9c4e4cb2fa5ca27c2df5
          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 46e847ac7f0652dceda9beb0c3fe69b7847897d1..eed7394c5736df4a966343cd8c1482dc0dfd0164 100644
+index cd723d7e216ff6de0daee9d21309006b9874f321..739fdb3218fd02e5b81bbff28906824e06933c17 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -340,6 +340,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -213,7 +213,7 @@ index 3f458ddd4dc04ed28510a212be76bb19e7f6a61e..a36469186f72eccf8c4428d920d0583b
                  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 f5e2a82f279e8c91b736410147d5e8476f3da128..1a4da06d45c88219ec0149f94876931f6c699dc9 100644
+index a20e1a533e9f764fbf00e768fd8286c8f7868a78..fd5906dd18a4ff377c6e2dd180008124faa9600d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -442,10 +442,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -233,7 +233,7 @@ index f5e2a82f279e8c91b736410147d5e8476f3da128..1a4da06d45c88219ec0149f94876931f
          for (ServerPlayer player : (List<ServerPlayer>) server.getHandle().players) {
              if (player.getBukkitEntity().canSee(this)) {
                  player.connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
-@@ -2887,5 +2892,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2903,5 +2908,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean usesPurpurClient() {
          return getHandle().purpurClient;
      }
@@ -305,7 +305,7 @@ index 74029209c431a709341161da6a0ac719188d5fac..034205c6e2887aee5d879db46fcf9548
      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 8643df8d81714edf60eebd6984bac2c933d1fbd6..4e5583cdd78608108bb1788e6881d4b4fbf014af 100644
+index 70b5b307193dc288a6257d90ca96762cb4a8345a..2fec279d8880e310cbddea2eb12e2fc4baf99d8c 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -203,6 +203,7 @@ public class ActivationRange
@@ -313,6 +313,6 @@ index 8643df8d81714edf60eebd6984bac2c933d1fbd6..4e5583cdd78608108bb1788e6881d4b4
              }
  
 +            if (!player.level.purpurConfig.idleTimeoutTickNearbyEntities && player.isAfk()) continue; // Purpur
-             ActivationRange.maxBB = player.getBoundingBox().inflate( maxRange, 256, maxRange );
-             ActivationType.MISC.boundingBox = player.getBoundingBox().inflate( miscActivationRange, 256, miscActivationRange );
-             ActivationType.RAIDER.boundingBox = player.getBoundingBox().inflate( raiderActivationRange, 256, raiderActivationRange );
+             // Paper start
+             int worldHeight = world.getHeight();
+             ActivationRange.maxBB = player.getBoundingBox().inflate( maxRange, worldHeight, maxRange );
diff --git a/patches/server/0020-Player-invulnerabilities.patch b/patches/server/0020-Player-invulnerabilities.patch
index d7890adfa..5f9d8ceea 100644
--- a/patches/server/0020-Player-invulnerabilities.patch
+++ b/patches/server/0020-Player-invulnerabilities.patch
@@ -121,10 +121,10 @@ index 3c9d72dd1a1bade79e4c8b5e6c7b136f906ba77d..02707189e0cafcb8db31413566f20784
          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 1a4da06d45c88219ec0149f94876931f6c699dc9..27e203e45531c053d78149c6e9f782d58e9f5d44 100644
+index fd5906dd18a4ff377c6e2dd180008124faa9600d..0655abd90e7fc34518153b320f5674bd4ebe8f5d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2907,5 +2907,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2923,5 +2923,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleTimer() {
          getHandle().resetLastActionTime();
      }
diff --git a/patches/server/0081-Squid-EAR-immunity.patch b/patches/server/0081-Squid-EAR-immunity.patch
index 727ac98b9..ffccd12b4 100644
--- a/patches/server/0081-Squid-EAR-immunity.patch
+++ b/patches/server/0081-Squid-EAR-immunity.patch
@@ -25,7 +25,7 @@ index 68d87cd69a830a4b5e15b31a43ab0a80f07fe7cc..0479eb38b18712028fd255e2749997d8
  
      public boolean spiderRidable = false;
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 4e5583cdd78608108bb1788e6881d4b4fbf014af..08d678f781a86e709a8b6066a12fd76830d142cc 100644
+index 2fec279d8880e310cbddea2eb12e2fc4baf99d8c..6e87153e62db14b5bc8a984c6c9c61780d102083 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -15,6 +15,7 @@ import net.minecraft.world.entity.ambient.AmbientCreature;
@@ -36,7 +36,7 @@ index 4e5583cdd78608108bb1788e6881d4b4fbf014af..08d678f781a86e709a8b6066a12fd768
  import net.minecraft.world.entity.animal.WaterAnimal;
  import net.minecraft.world.entity.animal.horse.Llama;
  import net.minecraft.world.entity.boss.EnderDragonPart;
-@@ -391,6 +392,7 @@ public class ActivationRange
+@@ -392,6 +393,7 @@ public class ActivationRange
       */
      public static boolean checkIfActive(Entity entity)
      {
diff --git a/patches/server/0121-Spread-out-and-optimise-player-list-ticksSpread-out-.patch b/patches/server/0121-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
index 6ea94b7bd..4629011a5 100644
--- a/patches/server/0121-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
+++ b/patches/server/0121-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
@@ -46,10 +46,10 @@ index 51c3c2b943aa0b1503c7c0b8df658728d8cbe152..7b617767451d5fa7e6d5b6777deb39d9
  
      public void broadcastAll(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f01633819138fabe782bb2897ae2488b0d376278..14e7f7a76d04eef143585a8b09fd61bc91899cf2 100644
+index 0655abd90e7fc34518153b320f5674bd4ebe8f5d..6cb6f091d83f02a8e19261ffd4986336d996ba84 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1832,7 +1832,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1848,7 +1848,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public boolean canSee(org.bukkit.entity.Entity entity) {
diff --git a/patches/server/0133-Add-EntityTeleportHinderedEvent.patch b/patches/server/0133-Add-EntityTeleportHinderedEvent.patch
index 55b3a0883..0f1587a4d 100644
--- a/patches/server/0133-Add-EntityTeleportHinderedEvent.patch
+++ b/patches/server/0133-Add-EntityTeleportHinderedEvent.patch
@@ -93,10 +93,10 @@ index b8cb317246b1f07c193abac9b5c84acdfe9ef958..3c3c9578f511987f8c237306647d04e8
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 14e7f7a76d04eef143585a8b09fd61bc91899cf2..54a1385e9e7d612a85e7dc0889c3660a1c45348b 100644
+index 6cb6f091d83f02a8e19261ffd4986336d996ba84..e98b1512de9fa68ced782fdd8455434a213931e6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1249,6 +1249,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1265,6 +1265,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
          if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API
diff --git a/patches/server/0189-Flying-Fall-Damage-API.patch b/patches/server/0189-Flying-Fall-Damage-API.patch
index e1fd82e87..a93afc9ac 100644
--- a/patches/server/0189-Flying-Fall-Damage-API.patch
+++ b/patches/server/0189-Flying-Fall-Damage-API.patch
@@ -26,10 +26,10 @@ index 45dc5eeb3794492324bd316719524ea797f7ef6a..bbfb5f8f88e972a770d0ce5373c67ffe
          } 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 54a1385e9e7d612a85e7dc0889c3660a1c45348b..56148154a9e685a1327c93be9057115232113476 100644
+index e98b1512de9fa68ced782fdd8455434a213931e6..d1d8f45565b6dcdca73b2cc6fd09917b7d89e08f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2932,5 +2932,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2948,5 +2948,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
          getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
      }
diff --git a/patches/server/0224-Extended-OfflinePlayer-API.patch b/patches/server/0224-Extended-OfflinePlayer-API.patch
index 7ce4936cf..10a56abd0 100644
--- a/patches/server/0224-Extended-OfflinePlayer-API.patch
+++ b/patches/server/0224-Extended-OfflinePlayer-API.patch
@@ -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 56148154a9e685a1327c93be9057115232113476..753ef343b7daab339a4308935e3cec86e49481f0 100644
+index d1d8f45565b6dcdca73b2cc6fd09917b7d89e08f..e05955bb255b0bad396fe93b7225350f73d7d623 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2206,6 +2206,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2222,6 +2222,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().getAbilities().walkingSpeed * 2f;
      }
  
diff --git a/patches/server/0289-Remove-Timings.patch b/patches/server/0289-Remove-Timings.patch
index d10f0c710..e77e2d89e 100644
--- a/patches/server/0289-Remove-Timings.patch
+++ b/patches/server/0289-Remove-Timings.patch
@@ -1037,7 +1037,7 @@ index c74ac9cf5db4d8adfe781cf066258011da469717..73c48bbb3c6ff9de15acb7adaa15f904
          // Paper end - add timings for scoreboard search
      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 08d678f781a86e709a8b6066a12fd76830d142cc..796e0ff6dda3ed7e237597d050e1277ea7939086 100644
+index 6e87153e62db14b5bc8a984c6c9c61780d102083..937e3e783cf2f38b30024d29600eb4d042816058 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -170,7 +170,7 @@ public class ActivationRange
@@ -1049,7 +1049,7 @@ index 08d678f781a86e709a8b6066a12fd76830d142cc..796e0ff6dda3ed7e237597d050e1277e
          final int miscActivationRange = world.spigotConfig.miscActivationRange;
          final int raiderActivationRange = world.spigotConfig.raiderActivationRange;
          final int animalActivationRange = world.spigotConfig.animalActivationRange;
-@@ -239,7 +239,7 @@ public class ActivationRange
+@@ -240,7 +240,7 @@ public class ActivationRange
              }
              // Paper end
          }
diff --git a/patches/server/0293-Debug-Marker-API.patch b/patches/server/0293-Debug-Marker-API.patch
index 112f132d0..aa0d4e788 100644
--- a/patches/server/0293-Debug-Marker-API.patch
+++ b/patches/server/0293-Debug-Marker-API.patch
@@ -99,10 +99,10 @@ index 824c12db04aaaa750de54fce8a15b386dec1cc08..01313fdd9d5a1909bfbcbf8f613030e7
  
      // Paper start
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 4d16fdee4a73f980c1dc0dfe9f9970d4f3c88190..56deaef79e42314117731c5a6ea0b1f5496435dd 100644
+index e05955bb255b0bad396fe93b7225350f73d7d623..f3839c16815b50dfce41c31bc6992dcbbd6759a5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2963,5 +2963,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2979,5 +2979,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean hasFlyingFallDamage() {
          return getHandle().flyingFallDamage;
      }