From ff0bea30982d5b842473632d0931be2d35f07250 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <blake.galbreath@gmail.com>
Date: Mon, 4 Jul 2022 15:39:33 -0500
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@1e5d1db Call StructureGrowEvent for mangrove propagule (#8023)
PaperMC/Paper@385f313 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8092)
PaperMC/Paper@fbb11db Add missing EntityDropItemEvent calls (#5674)
PaperMC/Paper@c879064 Call EntityDropItemEvent for goats dropping horns (#8094)
---
 gradle.properties                             |  2 +-
 patches/api/0004-Purpur-config-files.patch    |  4 +--
 patches/api/0005-Purpur-client-support.patch  |  4 +--
 patches/api/0010-AFK-API.patch                |  4 +--
 patches/api/0011-Bring-back-server-name.patch |  8 ++---
 patches/api/0014-Lagging-threshold.patch      |  8 ++---
 .../api/0017-Player-invulnerabilities.patch   |  4 +--
 patches/api/0035-Flying-Fall-Damage-API.patch |  4 +--
 ...the-ability-to-add-combustible-items.patch |  8 ++---
 .../0001-Pufferfish-Server-Changes.patch      | 36 +++++++++----------
 patches/server/0003-Rebrand.patch             |  6 ++--
 patches/server/0004-Purpur-config-files.patch | 12 +++----
 .../server/0005-Purpur-client-support.patch   |  8 ++---
 .../0007-Component-related-conveniences.patch |  4 +--
 patches/server/0008-Ridables.patch            | 24 ++++++-------
 ...-Configurable-entity-base-attributes.patch | 16 ++++-----
 patches/server/0013-AFK-API.patch             |  6 ++--
 .../server/0014-Bring-back-server-name.patch  |  4 +--
 patches/server/0017-Lagging-threshold.patch   |  6 ++--
 .../0020-Player-invulnerabilities.patch       |  4 +--
 .../0028-Disable-outdated-build-check.patch   |  6 ++--
 ...0051-Fix-the-dead-lagging-the-server.patch |  6 ++--
 ...urable-void-damage-height-and-damage.patch |  6 ++--
 .../0063-Add-canSaveToDisk-to-Entity.patch    |  4 +--
 ...0067-Add-5-second-tps-average-in-tps.patch |  6 ++--
 ...Stop-squids-floating-on-top-of-water.patch |  4 +--
 ...tities-can-use-portals-configuration.patch |  6 ++--
 ...ptimise-player-list-ticksSpread-out-.patch |  4 +--
 ...0134-Add-EntityTeleportHinderedEvent.patch |  8 ++---
 ...36-Movement-options-for-armor-stands.patch |  4 +--
 .../server/0137-Fix-stuck-in-portals.patch    |  4 +--
 patches/server/0157-Drowning-Settings.patch   |  6 ++--
 ...185-API-for-any-mob-to-burn-daylight.patch |  8 ++---
 ...ggle-for-end-portal-safe-teleporting.patch |  4 +--
 .../server/0190-Flying-Fall-Damage-API.patch  |  4 +--
 .../0225-Extended-OfflinePlayer-API.patch     |  4 +--
 ...the-ability-to-add-combustible-items.patch |  4 +--
 ...t-spiders-from-climbing-world-border.patch |  6 ++--
 patches/server/0256-Allow-void-trading.patch  |  4 +--
 patches/server/0280-Spark-Profiler.patch      |  4 +--
 40 files changed, 137 insertions(+), 137 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 3a89fc825..adfa662a0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19-R0.1-SNAPSHOT
 
-paperCommit = d86fde552363ef1a800b0eec5dd3ecf5cc768679
+paperCommit = c879064bfeaac42e1baed0e48973664a8ad75f37
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/api/0004-Purpur-config-files.patch b/patches/api/0004-Purpur-config-files.patch
index 9a8a11cb9..87527f37b 100644
--- a/patches/api/0004-Purpur-config-files.patch
+++ b/patches/api/0004-Purpur-config-files.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index e756edf56995f4552387c2e1082307eb3dd48bb3..1895ac9cd331f9c2b76203a3e1d9bbf0d40ce4f1 100644
+index 56e261efa654e4a6872ccea28f0461df13845d13..1960139be2793e4f3bf94d73abf7420b3a99ec01 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1922,6 +1922,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1937,6 +1937,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Paper end
  
diff --git a/patches/api/0005-Purpur-client-support.patch b/patches/api/0005-Purpur-client-support.patch
index a1938c652..0fa2ad9f8 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 6cd0b10d1dc4506cfb1e4db5e1260cb705566cec..81d8afa7b7ac9b65e3ea2a5e69e7ec5dc7b812b7 100644
+index c0fc38cacf441273e8430dda31958c15a48fc9b6..8bcf8ca71101988342d4c01c6943977d14ea60b6 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2698,4 +2698,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2705,4 +2705,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 6d70cd767..0a766c0ff 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 81d8afa7b7ac9b65e3ea2a5e69e7ec5dc7b812b7..a569decc40fff08d0675ffa4ee9e6f54f115ad97 100644
+index 8bcf8ca71101988342d4c01c6943977d14ea60b6..a262a1d3c2ad43ab163817967e06e7067cba3733 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2706,5 +2706,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2713,5 +2713,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @return True if Player uses Purpur Client
       */
      public boolean usesPurpurClient();
diff --git a/patches/api/0011-Bring-back-server-name.patch b/patches/api/0011-Bring-back-server-name.patch
index ad760e3be..76e702205 100644
--- a/patches/api/0011-Bring-back-server-name.patch
+++ b/patches/api/0011-Bring-back-server-name.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 3506a7fa07ee6e53704b1df8d8d2bb08704bfc37..320e4697236b743ffe4e32c0e73b82c3e6896683 100644
+index 92a1462261029e804da73da2743bbd68e57841e9..9ae019a2d8274bdfb5e788cb7aec03bbcbaa7c26 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2412,4 +2412,15 @@ public final class Bukkit {
+@@ -2429,4 +2429,15 @@ public final class Bukkit {
      public static Server.Spigot spigot() {
          return server.spigot();
      }
@@ -25,10 +25,10 @@ index 3506a7fa07ee6e53704b1df8d8d2bb08704bfc37..320e4697236b743ffe4e32c0e73b82c3
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 1895ac9cd331f9c2b76203a3e1d9bbf0d40ce4f1..3bb33271ecb6021e34db92127964579eaf5c54ff 100644
+index 1960139be2793e4f3bf94d73abf7420b3a99ec01..6cbd3636c01dc66125d5049b85205590af202605 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2102,4 +2102,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2117,4 +2117,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
      // Paper end
diff --git a/patches/api/0014-Lagging-threshold.patch b/patches/api/0014-Lagging-threshold.patch
index 5b7ae362c..3ea305c68 100644
--- a/patches/api/0014-Lagging-threshold.patch
+++ b/patches/api/0014-Lagging-threshold.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 320e4697236b743ffe4e32c0e73b82c3e6896683..b3c68150034d8944da00d77dd5a8aa21a025d678 100644
+index 9ae019a2d8274bdfb5e788cb7aec03bbcbaa7c26..a2f9b8b4a66af1dcb62a0b04bd6b5a447fac6439 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2422,5 +2422,14 @@ public final class Bukkit {
+@@ -2439,5 +2439,14 @@ public final class Bukkit {
      public static String getServerName() {
          return server.getServerName();
      }
@@ -24,10 +24,10 @@ index 320e4697236b743ffe4e32c0e73b82c3e6896683..b3c68150034d8944da00d77dd5a8aa21
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 3bb33271ecb6021e34db92127964579eaf5c54ff..80e3a94c4c67252351dbf97ef4255c49faf72c60 100644
+index 6cbd3636c01dc66125d5049b85205590af202605..1aca80c46a5ab3039ee2e42c6d28b46f141c501a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2110,5 +2110,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2125,5 +2125,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      String getServerName();
diff --git a/patches/api/0017-Player-invulnerabilities.patch b/patches/api/0017-Player-invulnerabilities.patch
index 32f42ab76..513b6c134 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 a569decc40fff08d0675ffa4ee9e6f54f115ad97..4f1213d5c5efb2c415eb22b927936eb932ed3a4a 100644
+index a262a1d3c2ad43ab163817967e06e7067cba3733..3f032de55933706c4fc054e58605e1ffd18a3bf5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2725,5 +2725,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2732,5 +2732,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 22ff01acd..49291b3bb 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 4f1213d5c5efb2c415eb22b927936eb932ed3a4a..0fbc571e2990cf79216359454972b80863d2f803 100644
+index 3f032de55933706c4fc054e58605e1ffd18a3bf5..2436ece75493dc05352dfa0027b98aaeaab0d5f7 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2746,5 +2746,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2753,5 +2753,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param invulnerableTicks Invulnerable ticks remaining
       */
      void setSpawnInvulnerableTicks(int invulnerableTicks);
diff --git a/patches/api/0041-Added-the-ability-to-add-combustible-items.patch b/patches/api/0041-Added-the-ability-to-add-combustible-items.patch
index 9446b0618..de0083373 100644
--- a/patches/api/0041-Added-the-ability-to-add-combustible-items.patch
+++ b/patches/api/0041-Added-the-ability-to-add-combustible-items.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Added the ability to add combustible items
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index b3c68150034d8944da00d77dd5a8aa21a025d678..9222adc75b68b9a899b4eca2a1803844b9cdbe26 100644
+index a2f9b8b4a66af1dcb62a0b04bd6b5a447fac6439..9b9af189b3865055570ba533b97c92c105cc5a37 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2431,5 +2431,24 @@ public final class Bukkit {
+@@ -2448,5 +2448,24 @@ public final class Bukkit {
      public static boolean isLagging() {
          return server.isLagging();
      }
@@ -34,10 +34,10 @@ index b3c68150034d8944da00d77dd5a8aa21a025d678..9222adc75b68b9a899b4eca2a1803844
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 80e3a94c4c67252351dbf97ef4255c49faf72c60..1ba84f8db9d279f5fb2b4be10c02919bb27de30a 100644
+index 1aca80c46a5ab3039ee2e42c6d28b46f141c501a..d73b7d72d00fa0edd6542226348af14c5203cf8d 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2117,5 +2117,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2132,5 +2132,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @return True if lagging
       */
      boolean isLagging();
diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch
index a12eb55bc..a783cf6e3 100644
--- a/patches/server/0001-Pufferfish-Server-Changes.patch
+++ b/patches/server/0001-Pufferfish-Server-Changes.patch
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 68b8f275f9c9e77a949ca29749a05b469bcdb910..a4a146d9c3e07bdf941d81147ca31daf4689a687 100644
+index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..74c91f79576e85618fefb79be8d313ba871701c7 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -9,8 +9,12 @@ plugins {
@@ -2197,7 +2197,7 @@ index 7034af8ad42940c5af6b9032b9873ce36c55a2a7..c0fdc5a79107f8694a514a12d5526bd4
  
      public static long getCoordinateKey(final ChunkPos pair) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 77cd45f616e2ff38ad6a648b8b865a99e544f3ec..e96ff8b13b1237d7c70359b78e4d72938877191f 100644
+index a934226dc9a273fac03c21227f7ef3d50ea080c4..7fd7c3be306d93201a61bb616f8c09cb066d4204 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -295,6 +295,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2218,7 +2218,7 @@ index 77cd45f616e2ff38ad6a648b8b865a99e544f3ec..e96ff8b13b1237d7c70359b78e4d7293
      }
  
      public SystemReport fillSystemReport(SystemReport details) {
-@@ -2228,6 +2230,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2223,6 +2225,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      }
  
      public ProfilerFiller getProfiler() {
@@ -2416,7 +2416,7 @@ index 3b144c820531122eb37d41be06c182b5f5dc0724..1eb912ad97f9663bf6bd336ad739f255
                          this.wasOnGround = this.entity.isOnGround();
                          this.teleportDelay = 0;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index e13fcd15ab00ab4aee7fb3774db6984743680259..d0cfbaf3fd5573f33ad3afc47a35157c0da5233a 100644
+index 1a918eabbaaed26d9bdf5c01e0488b5a117ba516..32a39a150a3d2bbae95a726901f3f46363e34ecf 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -689,7 +689,20 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2473,7 +2473,7 @@ index e13fcd15ab00ab4aee7fb3774db6984743680259..d0cfbaf3fd5573f33ad3afc47a35157c
              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 630a762b71861bfe21c47a11d4fe05e1a3b7d339..60373551c49386652de286127636b61f31e88527 100644
+index 6f2006c53a27531ab04a95e446e30d85eb422970..d42e220347cb39d7f0e04f9f47403bb1914e164d 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1149,6 +1149,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -2597,10 +2597,10 @@ index 540bc9500c35c0db719b00aa26f6fb3a1b08ed9f..806cb760822a99316b08ad95ff8922df
      int LARGE_MAX_STACK_SIZE = 64;
  
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b0728b66c54dc22a5a98f150910d07f4b38ebd7e..e6d25ab2e7e19d9fb993fdad6f650212f560cc1d 100644
+index 19a64b582bc042e426220e080d9c21b3a82cf3f7..beab9f74ba3c3ef294485ee74daf165475d29566 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -291,7 +291,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -292,7 +292,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public double yo;
      public double zo;
      private Vec3 position;
@@ -2609,7 +2609,7 @@ index b0728b66c54dc22a5a98f150910d07f4b38ebd7e..e6d25ab2e7e19d9fb993fdad6f650212
      private ChunkPos chunkPosition;
      private Vec3 deltaMovement;
      public float yRot; // Paper - private->public
-@@ -413,6 +413,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -414,6 +414,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return this.originWorld;
      }
      // Paper end
@@ -2621,7 +2621,7 @@ index b0728b66c54dc22a5a98f150910d07f4b38ebd7e..e6d25ab2e7e19d9fb993fdad6f650212
      public float getBukkitYaw() {
          return this.yRot;
      }
-@@ -436,17 +441,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -437,17 +442,36 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.isLegacyTrackingEntity = isLegacyTrackingEntity;
      }
  
@@ -2659,7 +2659,7 @@ index b0728b66c54dc22a5a98f150910d07f4b38ebd7e..e6d25ab2e7e19d9fb993fdad6f650212
          for (Entity passenger : passengers) {
              org.spigotmc.TrackingRange.TrackingRangeType passengerType = passenger.trackingRangeType;
              int passengerRange = chunkMap.getEntityTrackerRange(passengerType.ordinal());
-@@ -455,6 +479,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -456,6 +480,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  range = passengerRange;
              }
          }
@@ -2669,7 +2669,7 @@ index b0728b66c54dc22a5a98f150910d07f4b38ebd7e..e6d25ab2e7e19d9fb993fdad6f650212
  
          return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this));
      }
-@@ -786,6 +813,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -787,6 +814,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      // CraftBukkit end
  
      public void baseTick() {
@@ -2682,7 +2682,7 @@ index b0728b66c54dc22a5a98f150910d07f4b38ebd7e..e6d25ab2e7e19d9fb993fdad6f650212
          this.level.getProfiler().push("entityBaseTick");
          if (firstTick && this instanceof net.minecraft.world.entity.NeutralMob neutralMob) neutralMob.tickInitialPersistentAnger(level); // Paper - Update last hurt when ticking
          this.feetBlockState = null;
-@@ -3978,16 +4011,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3986,16 +4019,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -2708,7 +2708,7 @@ index b0728b66c54dc22a5a98f150910d07f4b38ebd7e..e6d25ab2e7e19d9fb993fdad6f650212
              double d1 = 0.0D;
              boolean flag = this.isPushedByFluid();
              boolean flag1 = false;
-@@ -3995,14 +4030,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4003,14 +4038,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              int k1 = 0;
              BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
  
@@ -2776,7 +2776,7 @@ index b0728b66c54dc22a5a98f150910d07f4b38ebd7e..e6d25ab2e7e19d9fb993fdad6f650212
  
                              if (d2 >= axisalignedbb.minY) {
                                  flag1 = true;
-@@ -4024,9 +4106,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4032,9 +4114,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                                  // CraftBukkit end
                              }
                          }
@@ -3077,7 +3077,7 @@ index da5e6141f548539cac720aba558e1b6f3a87e474..fdd2c63ff0017bafa544a3cff2ee6d2d
          this.level.getProfiler().pop();
          this.level.getProfiler().push("axolotlActivityUpdate");
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index 56dd01801f56c56d07101e7e22b58ac059f5f07f..f489301701f8abfb8f509d91089c1433db2346f8 100644
+index 31be36e6b7b6bd0c0d7fda4e1b03ecd38947f3a5..362f952888f63a453a4352a9f1dc7df799244a3c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 @@ -163,9 +163,11 @@ public class Goat extends Animal {
@@ -4182,10 +4182,10 @@ index b1992ed5136cc7dcf04219868b94b3c37ae36b4b..5b5339cba819368f4d6b7eaf404fa59b
  
      @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 61c2f864bb23e75f6c377f7ccbf2ec44a670348c..ba0412e8462372f5743e9282de6a50a45ee25add 100644
+index a8cf1ab9d7504dfdb2310f1dca82324a225bea7d..b5de069683a615be9b9b33c3d8e61e46bbbec8e3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -245,7 +245,7 @@ import javax.annotation.Nullable; // Paper
+@@ -246,7 +246,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
@@ -4194,7 +4194,7 @@ index 61c2f864bb23e75f6c377f7ccbf2ec44a670348c..ba0412e8462372f5743e9282de6a50a4
      private final String serverVersion;
      private final String bukkitVersion = Versioning.getBukkitVersion();
      private final Logger logger = Logger.getLogger("Minecraft");
-@@ -1043,6 +1043,11 @@ public final class CraftServer implements Server {
+@@ -1045,6 +1045,11 @@ public final class CraftServer implements Server {
                  plugin.getDescription().getName(),
                  "This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
              ));
diff --git a/patches/server/0003-Rebrand.patch b/patches/server/0003-Rebrand.patch
index 242200bbb..252f96bab 100644
--- a/patches/server/0003-Rebrand.patch
+++ b/patches/server/0003-Rebrand.patch
@@ -168,7 +168,7 @@ index 1a859fef0848cf23a672012e9764965ae1c07ec5..14ed740609b14242c2a8d377a78b2f71
          stringbuilder.append(CrashReport.getErrorComment());
          stringbuilder.append("\n\n");
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e96ff8b13b1237d7c70359b78e4d72938877191f..7b3b8c20b5c33804753e55324651f5fbe69e231e 100644
+index 7fd7c3be306d93201a61bb616f8c09cb066d4204..6e78441fb4089543947d0f7a3065a49d3e6373a5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -295,7 +295,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -231,10 +231,10 @@ index c31b9a6b1d4548d507ecb60d42ca9f96f49f6c4b..f613825c69a8d683b8029fe345031259
  
      private static final int DEFAULT_SIZE_THRESHOLD = 1024 * 8;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 33218552405c526955d30031469d3044c724dde3..22d7c6ecc0e65751f82925d2e4c63d1dfef0c441 100644
+index b5de069683a615be9b9b33c3d8e61e46bbbec8e3..42fe8f12b6c7c11a46fe9627a2a5a87ebea821c3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -245,7 +245,7 @@ import javax.annotation.Nullable; // Paper
+@@ -246,7 +246,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
diff --git a/patches/server/0004-Purpur-config-files.patch b/patches/server/0004-Purpur-config-files.patch
index 931605481..9fd8f90c3 100644
--- a/patches/server/0004-Purpur-config-files.patch
+++ b/patches/server/0004-Purpur-config-files.patch
@@ -105,10 +105,10 @@ index 8bae26d296eb73642fa1a2f83ec1a28fadcade0c..2f98c6a031a4e08c8395c326d35b129c
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d5b553bb34e988ce916ab5cdc53a8a99b141b00d..cc779a1a5b11a92366fd04585369e0d93eb184f4 100644
+index 42fe8f12b6c7c11a46fe9627a2a5a87ebea821c3..17ad3fb575444c36884202daffb685d03f0a5cb8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -957,6 +957,7 @@ public final class CraftServer implements Server {
+@@ -959,6 +959,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
@@ -116,7 +116,7 @@ index d5b553bb34e988ce916ab5cdc53a8a99b141b00d..cc779a1a5b11a92366fd04585369e0d9
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -972,6 +973,7 @@ public final class CraftServer implements Server {
+@@ -974,6 +975,7 @@ public final class CraftServer implements Server {
                  }
              }
              world.spigotConfig.init(); // Spigot
@@ -124,7 +124,7 @@ index d5b553bb34e988ce916ab5cdc53a8a99b141b00d..cc779a1a5b11a92366fd04585369e0d9
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -987,6 +989,7 @@ public final class CraftServer implements Server {
+@@ -989,6 +991,7 @@ public final class CraftServer implements Server {
          this.reloadData();
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@@ -132,7 +132,7 @@ index d5b553bb34e988ce916ab5cdc53a8a99b141b00d..cc779a1a5b11a92366fd04585369e0d9
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2722,6 +2725,18 @@ public final class CraftServer implements Server {
+@@ -2729,6 +2732,18 @@ public final class CraftServer implements Server {
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
  
@@ -152,7 +152,7 @@ index d5b553bb34e988ce916ab5cdc53a8a99b141b00d..cc779a1a5b11a92366fd04585369e0d9
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 1b9e91b20dd9a9375a0a2a6a4d7a0bcdce9e7b1a..f9bd31f1cf8b7c98cfa7a3fb0be0bbb001a2ab1c 100644
+index c55ae77807e0ec3698f0d0443caaf18928b41017..2fae47d9e75a33416e27b6a2256365540149a571 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -158,6 +158,14 @@ public class Main {
diff --git a/patches/server/0005-Purpur-client-support.patch b/patches/server/0005-Purpur-client-support.patch
index 97a14f64c..1df62d7fe 100644
--- a/patches/server/0005-Purpur-client-support.patch
+++ b/patches/server/0005-Purpur-client-support.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Purpur client support
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index c8057f98e16ba6e19640e0b250e5201e0f4f57db..9a5e3f75663f6dd3351e23d850c446874c03b6a0 100644
+index 353463084d90eb684717e65c56da52cd25a1e375..6b63a8e880e93866e12e90769951bfcd844528f9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -260,6 +260,7 @@ public class ServerPlayer extends Player {
@@ -17,7 +17,7 @@ index c8057f98e16ba6e19640e0b250e5201e0f4f57db..9a5e3f75663f6dd3351e23d850c44687
      public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 60373551c49386652de286127636b61f31e88527..147a8a0ff6593724f311b077579178c412480451 100644
+index d42e220347cb39d7f0e04f9f47403bb1914e164d..5574fdf7001d3bfc8ebef9af38039318125d0ba5 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3375,6 +3375,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -43,10 +43,10 @@ index 60373551c49386652de286127636b61f31e88527..147a8a0ff6593724f311b077579178c4
              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 abcce6bd0b32d0188751393a6f56f2e82530912c..8deb966c33b890560c8f5cc875d8225e29aa42e9 100644
+index 287520f91e22309e1268be1940e0fafb628980a9..00c9bf988de09a6214a7ac21acfeb288862900c2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2789,4 +2789,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2796,4 +2796,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.spigot;
      }
      // Spigot end
diff --git a/patches/server/0007-Component-related-conveniences.patch b/patches/server/0007-Component-related-conveniences.patch
index 01dce5958..e1ca50458 100644
--- a/patches/server/0007-Component-related-conveniences.patch
+++ b/patches/server/0007-Component-related-conveniences.patch
@@ -81,10 +81,10 @@ index 67bce77093dcc126098731047447da2031e3388d..c4088446d30c3b25cf196f51fd394cd0
          return this.isFireSource;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e6d25ab2e7e19d9fb993fdad6f650212f560cc1d..5a50c83f288c2c4924f56ea42a4a5a9502c485a6 100644
+index beab9f74ba3c3ef294485ee74daf165475d29566..3a8f78ad1037b2bae3ab1ae40cbc25f4acafbc93 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3770,6 +3770,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3778,6 +3778,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return SlotAccess.NULL;
      }
  
diff --git a/patches/server/0008-Ridables.patch b/patches/server/0008-Ridables.patch
index b1ac80825..97b336a21 100644
--- a/patches/server/0008-Ridables.patch
+++ b/patches/server/0008-Ridables.patch
@@ -22,7 +22,7 @@ index 153451ecd5b3c8e8ecb2d5ec91ccd582d4300899..56536c39bccfe097f8227c74a0d16799
          super(x, y, z);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7b3b8c20b5c33804753e55324651f5fbe69e231e..ef30cc43c89594a1d42c1ca4b20b54893d9ce26c 100644
+index 6e78441fb4089543947d0f7a3065a49d3e6373a5..455f1335c97193e35195f92a8884489a7be9d582 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1533,6 +1533,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -34,7 +34,7 @@ index 7b3b8c20b5c33804753e55324651f5fbe69e231e..ef30cc43c89594a1d42c1ca4b20b5489
  
              this.profiler.push(() -> {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9bcea650735472d446df4663e49307855415e323..9fccf684d88014714b7468da41b937648e1a3e32 100644
+index 4094d08d478a98cb4ff13ff3274ad0d88cd46e85..be388b21b256ba68e42b8f998722ef5dcc1edac3 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -218,6 +218,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -66,7 +66,7 @@ index 3ed1bd3f9a75056c040a3563533d53ad4438b962..2842ba7028bf833478758f2e839796b2
  
      public void doTick() {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 147a8a0ff6593724f311b077579178c412480451..22fad6467c6b9202e8cbf3e77e90c50f73f1f640 100644
+index 5574fdf7001d3bfc8ebef9af38039318125d0ba5..b639bb8582389c7f675fb9a7f60aebb9615b766e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2662,6 +2662,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -79,10 +79,10 @@ index 147a8a0ff6593724f311b077579178c412480451..22fad6467c6b9202e8cbf3e77e90c50f
                          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)) {
                              ServerGamePacketListenerImpl.this.send(new ClientboundAddEntityPacket(entity));
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 5a50c83f288c2c4924f56ea42a4a5a9502c485a6..24568ee758ac75d9b38184f9e236fc3242850b45 100644
+index 3a8f78ad1037b2bae3ab1ae40cbc25f4acafbc93..4733085d0782b80f9d74db7adc0929440cac3d47 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 {
+@@ -362,7 +362,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      private final Set<String> tags;
      private final double[] pistonDeltas;
      private long pistonDeltasGameTime;
@@ -91,7 +91,7 @@ index 5a50c83f288c2c4924f56ea42a4a5a9502c485a6..24568ee758ac75d9b38184f9e236fc32
      private float eyeHeight;
      public boolean isInPowderSnow;
      public boolean wasInPowderSnow;
-@@ -2761,6 +2761,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2770,6 +2770,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  this.passengers = ImmutableList.copyOf(list);
              }
  
@@ -104,7 +104,7 @@ index 5a50c83f288c2c4924f56ea42a4a5a9502c485a6..24568ee758ac75d9b38184f9e236fc32
          }
          return true; // CraftBukkit
      }
-@@ -2801,6 +2807,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2810,6 +2816,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
                  return false;
              }
              // Spigot end
@@ -119,7 +119,7 @@ index 5a50c83f288c2c4924f56ea42a4a5a9502c485a6..24568ee758ac75d9b38184f9e236fc32
              if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
                  this.passengers = ImmutableList.of();
              } else {
-@@ -4517,4 +4531,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4525,4 +4539,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return ((ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
      }
      // Paper end
@@ -993,7 +993,7 @@ index 425c6da0de40983b0870c9fd1b53f16b6a11c34c..8f046fb76b6967e72abde523ffb790e0
              // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-index 7c53dddb598de85abf1eb8b8ee183a6e8e6f9c74..badaa1cb7919cc4699c5e732f9c84254416efdc3 100644
+index 3f100d847fbce6db5b625e99c4f3694576237372..7343f6fa6c29d4029cc35e173e5d701efd7f57c6 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 @@ -78,14 +78,87 @@ public class Dolphin extends WaterAnimal {
@@ -1123,7 +1123,7 @@ index 7c53dddb598de85abf1eb8b8ee183a6e8e6f9c74..badaa1cb7919cc4699c5e732f9c84254
              this.setAirSupply(this.getMaxAirSupply());
          } else {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index 8f294f10aca2df007830b12da0506f7614206a89..7bb7aaaff1e6e11db68b0f206bdf04fda0e88fc4 100644
+index 6a66b5d1a3d8615dcc15057f03476e9ccbf4b4f2..6a1c2a43aa00a2e651ca19d2acfa54ae3f020c5f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
 @@ -140,6 +140,44 @@ public class Fox extends Animal {
@@ -2453,7 +2453,7 @@ index 3dd4e6d622a6daafa00ae971edd88a147e34beef..4dca3788a8fa335dc5969bd61cd0658f
      protected PathNavigation createNavigation(Level world) {
          return new WaterBoundPathNavigation(this, world);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index f489301701f8abfb8f509d91089c1433db2346f8..ba47201f7b9ebfba28dc2f7ddc89375a8662476d 100644
+index 362f952888f63a453a4352a9f1dc7df799244a3c..04eb870ac7db68f5854e0f52f2b3c988c9f35c6f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 @@ -89,6 +89,23 @@ public class Goat extends Animal {
@@ -5143,7 +5143,7 @@ index 4132c1113f5437a776e5e3c1cb306904775aed88..1a945a32c3d3705a318ebca72a365931
      public void tick() {
          super.tick();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 5b92c2ca03baed38f7d41a73fae7dd23ce541d43..3cc9dab362141fdf61bdcd542ffa5e5c11f99e24 100644
+index 2a6c67634c31c332102d24bef293da1bacd0c000..158e1a61e9cc2661a09f6c4edb7db16464ca2e6d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1322,4 +1322,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0009-Configurable-entity-base-attributes.patch b/patches/server/0009-Configurable-entity-base-attributes.patch
index 2285970a3..d40e0bcfb 100644
--- a/patches/server/0009-Configurable-entity-base-attributes.patch
+++ b/patches/server/0009-Configurable-entity-base-attributes.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable entity base attributes
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e2b2be41e9981196650096dd9d468618a96cb28e..5fa0b40eaa545d1047591f7166bb43e1872ffe34 100644
+index 4733085d0782b80f9d74db7adc0929440cac3d47..1a6786565e5da5418423e9cb937a966a0755a0f9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -155,7 +155,7 @@ import org.bukkit.plugin.PluginManager;
+@@ -156,7 +156,7 @@ import org.bukkit.plugin.PluginManager;
  // CraftBukkit end
  
  public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -34,7 +34,7 @@ index 882ab40c8cdea8c214cb8344b3ccecddb2967c1c..cb79d2c958fbd34f8c8818e7e1c0db88
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 14444b86758912e9938026178ac3ba4e16e3b966..5a45e04f81171b3682cf39fcd3e35e440dec9090 100644
+index 70846a6b4674bcb9bd95e933e32812c19e4a5a54..15ece7c31d5e960d7672aa95fb7e039ca3d69375 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -288,6 +288,7 @@ public abstract class LivingEntity extends Entity {
@@ -158,7 +158,7 @@ index 8f046fb76b6967e72abde523ffb790e0f46b80e0..dd4d5e2e7cbfed18cf3b4664dbe08eaf
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-index badaa1cb7919cc4699c5e732f9c84254416efdc3..b3e53f922a424a407adb0111c29c8be6f89f8115 100644
+index 7343f6fa6c29d4029cc35e173e5d701efd7f57c6..1ca3ffe212da2c3914c290172e729ba8017f631c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 @@ -157,6 +157,11 @@ public class Dolphin extends WaterAnimal {
@@ -174,7 +174,7 @@ index badaa1cb7919cc4699c5e732f9c84254416efdc3..b3e53f922a424a407adb0111c29c8be6
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index 7bb7aaaff1e6e11db68b0f206bdf04fda0e88fc4..8d25d79be606b173a59264706172561165f82143 100644
+index 6a1c2a43aa00a2e651ca19d2acfa54ae3f020c5f..0d1e8ad0edcbe53d203b9fa6748f76f783afae5c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
 @@ -176,6 +176,11 @@ public class Fox extends Animal {
@@ -475,7 +475,7 @@ index 32b31e5efb5fc68430b9bcd4cd972494f53accc8..a80a7d460051a39fe805ae669b4586fb
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index ba47201f7b9ebfba28dc2f7ddc89375a8662476d..aa2abe00478b002fc90166441d8b89c7046ed022 100644
+index 04eb870ac7db68f5854e0f52f2b3c988c9f35c6f..77be0c6f6e6061ceee1daa467c20c8d7ece7590e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 @@ -104,6 +104,11 @@ public class Goat extends Animal {
@@ -719,7 +719,7 @@ index 0f8ce0c6ddbb37a61c6b15bb769b627bcd8105fa..6ed9e4e98c46b51cf398641ffb66abf3
  
      public static AttributeSupplier.Builder createAttributes() {
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 079a85f1520cda6a0fb72d0dd7f9e18aec6a6c91..c1b67d5dc5fd533fb2aa28a5c7d9dd87cc7412d8 100644
+index 0876034f2735af2b143112162b38a5bfd71139bb..7dcc1fd63294afa95b2f7115a72961ce175f01f2 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -160,6 +160,11 @@ public class EnderDragon extends Mob implements Enemy {
@@ -1338,7 +1338,7 @@ index be664e96a63bf6042375654e8297e4d6a54c7c8b..60d2abecb21c767fe290ffc9b7dd3446
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-index 42f6de4e9277d7208d5e0afb5a80d33f7f81ac46..e2e530aeba1311a0d89f1193ee0f6899e78ddfc0 100644
+index 457de9aa4e049682f37421e3d83e7a7b09f66675..6d5251228128c38961fa6714b8569fa5e764c36d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 @@ -93,6 +93,16 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
diff --git a/patches/server/0013-AFK-API.patch b/patches/server/0013-AFK-API.patch
index 18832029c..a83e27c01 100644
--- a/patches/server/0013-AFK-API.patch
+++ b/patches/server/0013-AFK-API.patch
@@ -68,7 +68,7 @@ index 2842ba7028bf833478758f2e839796b25084b1b3..faaf63fe5afd825de34a5c4c586d106f
          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 22fad6467c6b9202e8cbf3e77e90c50f73f1f640..c48b44129881d864cca6254b222d0ecbb7d78bcf 100644
+index b639bb8582389c7f675fb9a7f60aebb9615b766e..250182281905fd9f02491a5dcd03cd3091a80029 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -313,6 +313,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -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 8deb966c33b890560c8f5cc875d8225e29aa42e9..16aa402f7b9ff8c2f1748bc4c82005ccf093ceb4 100644
+index 00c9bf988de09a6214a7ac21acfeb288862900c2..d95fd0174a067d53c2c08ec2bf6758bce6ce944c 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 8deb966c33b890560c8f5cc875d8225e29aa42e9..16aa402f7b9ff8c2f1748bc4c82005cc
          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()));
-@@ -2795,5 +2800,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2802,5 +2807,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean usesPurpurClient() {
          return getHandle().purpurClient;
      }
diff --git a/patches/server/0014-Bring-back-server-name.patch b/patches/server/0014-Bring-back-server-name.patch
index ca91ea9c3..d1f8027a6 100644
--- a/patches/server/0014-Bring-back-server-name.patch
+++ b/patches/server/0014-Bring-back-server-name.patch
@@ -17,10 +17,10 @@ index 26345494ce190b5cd2ab58dd7d4b046796767b20..20d579a20e186e59975df1b35112015e
      public final boolean spawnNpcs = this.get("spawn-npcs", true);
      public final boolean pvp = this.get("pvp", true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cc779a1a5b11a92366fd04585369e0d93eb184f4..317ec55ac02deb9e88fa658f2eaa150409c12127 100644
+index 17ad3fb575444c36884202daffb685d03f0a5cb8..ce0f32be89e0a21e536de21e7b24bfa048fd55cb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2912,4 +2912,11 @@ public final class CraftServer implements Server {
+@@ -2919,4 +2919,11 @@ public final class CraftServer implements Server {
      }
  
      // Paper end
diff --git a/patches/server/0017-Lagging-threshold.patch b/patches/server/0017-Lagging-threshold.patch
index 1d7caccd4..83004b08f 100644
--- a/patches/server/0017-Lagging-threshold.patch
+++ b/patches/server/0017-Lagging-threshold.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 781da79fb246b8d4263ede4d8d5cc22090d9e4ba..6f7326c26e900a96ab119e5ee0f069912d7a94c0 100644
+index afaf1d716a95f891056c5241b483309daa997c3d..f477d1c6c0a662dacc924977db1bbe528e4a31be 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -291,6 +291,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -25,10 +25,10 @@ index 781da79fb246b8d4263ede4d8d5cc22090d9e4ba..6f7326c26e900a96ab119e5ee0f06991
                  }
                  // Spigot end
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 317ec55ac02deb9e88fa658f2eaa150409c12127..2dc8d141f20787981ede3a27b5683408142a7c1f 100644
+index ce0f32be89e0a21e536de21e7b24bfa048fd55cb..1de90d5038fa542ac544a19a78796cc20a748017 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2918,5 +2918,10 @@ public final class CraftServer implements Server {
+@@ -2925,5 +2925,10 @@ public final class CraftServer implements Server {
      public String getServerName() {
          return this.getProperties().serverName;
      }
diff --git a/patches/server/0020-Player-invulnerabilities.patch b/patches/server/0020-Player-invulnerabilities.patch
index 3716fdb58..de019341c 100644
--- a/patches/server/0020-Player-invulnerabilities.patch
+++ b/patches/server/0020-Player-invulnerabilities.patch
@@ -121,10 +121,10 @@ index 1e4be9af14b305aed38a7a3cf38a4659ba3aeb18..407bcae5459cbc6c670f7f44dd8bb593
          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 16aa402f7b9ff8c2f1748bc4c82005ccf093ceb4..5cd36fef58afdc60d58acde8809f6507d4d1ea04 100644
+index d95fd0174a067d53c2c08ec2bf6758bce6ce944c..b82d150f9b634c5a69cf60e6d1daee9b561cd51b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2815,5 +2815,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2822,5 +2822,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleTimer() {
          getHandle().resetLastActionTime();
      }
diff --git a/patches/server/0028-Disable-outdated-build-check.patch b/patches/server/0028-Disable-outdated-build-check.patch
index d51b43add..16af581cb 100644
--- a/patches/server/0028-Disable-outdated-build-check.patch
+++ b/patches/server/0028-Disable-outdated-build-check.patch
@@ -5,15 +5,15 @@ Subject: [PATCH] Disable outdated build check
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 516d26bcff64c828d3ec1607d3b774b54ab979e3..1f3c4adf3aeb28bcb91cb6913459ea2923ad95a4 100644
+index 2fae47d9e75a33416e27b6a2256365540149a571..1d2d36cf9befba024b82a0fe181811efd528ba2f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -270,7 +270,7 @@ public class Main {
                      System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
                  }
  
--                if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
-+                if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {  // Purpur
+-                if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
++                if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { // Purpur
                      Date buildDate = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z").parse(Main.class.getPackage().getImplementationVendor()); // Paper
  
                      Calendar deadline = Calendar.getInstance();
diff --git a/patches/server/0051-Fix-the-dead-lagging-the-server.patch b/patches/server/0051-Fix-the-dead-lagging-the-server.patch
index b951f2ef8..62845c680 100644
--- a/patches/server/0051-Fix-the-dead-lagging-the-server.patch
+++ b/patches/server/0051-Fix-the-dead-lagging-the-server.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix the dead lagging the server
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6e2c7db44373738b9c0bc30dff1078b04dafa98a..a33b5792a2966847568d6d96e696fef18200b872 100644
+index 1a6786565e5da5418423e9cb937a966a0755a0f9..592ca6d3a49f08721f38f84b580bc46a0fb92dd5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1870,6 +1870,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1871,6 +1871,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.yRotO = this.getYRot();
          this.xRotO = this.getXRot();
          this.setYHeadRot(yaw); // Paper - Update head rotation
@@ -17,7 +17,7 @@ index 6e2c7db44373738b9c0bc30dff1078b04dafa98a..a33b5792a2966847568d6d96e696fef1
  
      public void absMoveTo(double x, double y, double z) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index ccc034d345d4c7ea1b8317023e2e410d5c231ec9..bc19439abb1cbf548b1eda2a6527d9e825ea34ab 100644
+index 28b85ca8ad4ace31819099f9422779d86987425e..773f2a44c26c4c5c00fab0b502eb08652f23b56e 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2974,7 +2974,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0062-Configurable-void-damage-height-and-damage.patch b/patches/server/0062-Configurable-void-damage-height-and-damage.patch
index 162beaa86..cb72c65a2 100644
--- a/patches/server/0062-Configurable-void-damage-height-and-damage.patch
+++ b/patches/server/0062-Configurable-void-damage-height-and-damage.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable void damage height and damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a33b5792a2966847568d6d96e696fef18200b872..f6201f11bceeec05d436fa68354c222995d7bc2f 100644
+index 592ca6d3a49f08721f38f84b580bc46a0fb92dd5..28fa14e0cc2a0a93782bd0a8063553ff2d55a2e7 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -889,7 +889,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -890,7 +890,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
      public void checkOutOfWorld() {
          // Paper start - Configurable nether ceiling damage
@@ -18,7 +18,7 @@ index a33b5792a2966847568d6d96e696fef18200b872..f6201f11bceeec05d436fa68354c2229
              && this.getY() >= this.level.paperConfig().environment.netherCeilingVoidDamageHeight)) {
              // Paper end
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index bc19439abb1cbf548b1eda2a6527d9e825ea34ab..40c716bd22d54f7f669d570d1bebcb1848ae66aa 100644
+index 773f2a44c26c4c5c00fab0b502eb08652f23b56e..723fa3c2a305a160cb05fb5478c96d2c6aadba83 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2466,7 +2466,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0063-Add-canSaveToDisk-to-Entity.patch b/patches/server/0063-Add-canSaveToDisk-to-Entity.patch
index d498eca4c..4fe539a2c 100644
--- a/patches/server/0063-Add-canSaveToDisk-to-Entity.patch
+++ b/patches/server/0063-Add-canSaveToDisk-to-Entity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add canSaveToDisk to Entity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f6201f11bceeec05d436fa68354c222995d7bc2f..e0c79bf667aff0936b59a582ee36659e83d0dbc9 100644
+index 28fa14e0cc2a0a93782bd0a8063553ff2d55a2e7..8ceab2668625c34c790fd21414b98bb6489b0ec3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4572,5 +4572,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4580,5 +4580,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public boolean processClick(InteractionHand hand) {
          return false;
      }
diff --git a/patches/server/0067-Add-5-second-tps-average-in-tps.patch b/patches/server/0067-Add-5-second-tps-average-in-tps.patch
index 616cf97d3..7aea8b3a9 100644
--- a/patches/server/0067-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0067-Add-5-second-tps-average-in-tps.patch
@@ -27,7 +27,7 @@ index fa56cd09102a89692b42f1d14257990508c5c720..f9251183df72ddc56662fd3f02acf216
          setListData(vector);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9fe2178e3d38674a1be54a54ec6056145dc68859..1926be61107787f534d7f9b013396841a7a43615 100644
+index d08ea6085b9d017a4318d891bf57e92e466e133d..a2fe164d75c1e09050b70950469c253adba069f7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -287,7 +287,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -69,10 +69,10 @@ index 9fe2178e3d38674a1be54a54ec6056145dc68859..1926be61107787f534d7f9b013396841
                          lagging = recentTps[0] < org.purpurmc.purpur.PurpurConfig.laggingThreshold; // Purpur
                      tickSection = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2dc8d141f20787981ede3a27b5683408142a7c1f..787fa6e886c9cb9cadee15d5481ff75fbf47ec1a 100644
+index 1de90d5038fa542ac544a19a78796cc20a748017..6599d84d7ff4ef54d4ee8c4f9204335c8a6a1062 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2679,6 +2679,7 @@ public final class CraftServer implements Server {
+@@ -2686,6 +2686,7 @@ public final class CraftServer implements Server {
      @Override
      public double[] getTPS() {
          return new double[] {
diff --git a/patches/server/0093-Stop-squids-floating-on-top-of-water.patch b/patches/server/0093-Stop-squids-floating-on-top-of-water.patch
index bf24b9810..684505d42 100644
--- a/patches/server/0093-Stop-squids-floating-on-top-of-water.patch
+++ b/patches/server/0093-Stop-squids-floating-on-top-of-water.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Stop squids floating on top of water
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e0c79bf667aff0936b59a582ee36659e83d0dbc9..216f242232c3384afa2c6a8bffd6e29728364c9f 100644
+index 8ceab2668625c34c790fd21414b98bb6489b0ec3..5d4049c58135893a65eb167f12afe0238bf5cbeb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4039,6 +4039,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4047,6 +4047,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          this.yRotO = this.getYRot();
      }
  
diff --git a/patches/server/0095-Entities-can-use-portals-configuration.patch b/patches/server/0095-Entities-can-use-portals-configuration.patch
index a0f473190..534fc0a04 100644
--- a/patches/server/0095-Entities-can-use-portals-configuration.patch
+++ b/patches/server/0095-Entities-can-use-portals-configuration.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entities can use portals configuration
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 216f242232c3384afa2c6a8bffd6e29728364c9f..6141ff524ac4fc1ee6bcb2b871be8c0d4b078997 100644
+index 5d4049c58135893a65eb167f12afe0238bf5cbeb..63887de35be7b1b9076bc509b92af0b860886310 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2873,7 +2873,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2882,7 +2882,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public void handleInsidePortal(BlockPos pos) {
          if (this.isOnPortalCooldown()) {
              this.setPortalCooldown();
@@ -17,7 +17,7 @@ index 216f242232c3384afa2c6a8bffd6e29728364c9f..6141ff524ac4fc1ee6bcb2b871be8c0d
              if (!this.level.isClientSide && !pos.equals(this.portalEntrancePos)) {
                  this.portalEntrancePos = pos.immutable();
              }
-@@ -3538,7 +3538,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3546,7 +3546,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public boolean canChangeDimensions() {
diff --git a/patches/server/0122-Spread-out-and-optimise-player-list-ticksSpread-out-.patch b/patches/server/0122-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
index 1e741eb32..b84bbfa51 100644
--- a/patches/server/0122-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
+++ b/patches/server/0122-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
@@ -46,10 +46,10 @@ index db23e2afd1b9a7a8e1b29e48a31441b0a64beb5d..dea412353ba3e997d8024cb0770b9ac7
  
      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 5cd36fef58afdc60d58acde8809f6507d4d1ea04..6e061bf2951f0bd86364da3129f365799edda24c 100644
+index b82d150f9b634c5a69cf60e6d1daee9b561cd51b..e8ec6547c11248a2bcc92bbd6226a264f3a51234 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1734,7 +1734,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1741,7 +1741,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public boolean canSee(org.bukkit.entity.Entity entity) {
diff --git a/patches/server/0134-Add-EntityTeleportHinderedEvent.patch b/patches/server/0134-Add-EntityTeleportHinderedEvent.patch
index ada0715c3..8712a9c7d 100644
--- a/patches/server/0134-Add-EntityTeleportHinderedEvent.patch
+++ b/patches/server/0134-Add-EntityTeleportHinderedEvent.patch
@@ -78,7 +78,7 @@ index 5c7e30eb5e8a2a1ab18750a2cd2ec7364e8c52e0..ecd0ba252feb57cb1d60745e7750a676
  
              blockEntity.teleportCooldown = 100;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 3cc9dab362141fdf61bdcd542ffa5e5c11f99e24..51325f67c49680417b8b843135ec0e91481fe7fc 100644
+index 158e1a61e9cc2661a09f6c4edb7db16464ca2e6d..2890ca4d1886cf1e259fd7e7e8bab7ca33036e53 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -575,6 +575,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -93,10 +93,10 @@ index 3cc9dab362141fdf61bdcd542ffa5e5c11f99e24..51325f67c49680417b8b843135ec0e91
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6e061bf2951f0bd86364da3129f365799edda24c..3cc4f0020829ac935c325d5df7a16aabe26fe154 100644
+index e8ec6547c11248a2bcc92bbd6226a264f3a51234..4487aef74152b0630a766293516135b3927cea7f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1151,6 +1151,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1158,6 +1158,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
          if (entity.isVehicle()) {
@@ -108,7 +108,7 @@ index 6e061bf2951f0bd86364da3129f365799edda24c..3cc4f0020829ac935c325d5df7a16aab
          }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index f856cdf0d762426cdd316dcaf935f6ca0b502f62..53a2926f0437b84c7da7fa5beee5d20d97a20966 100644
+index 3162db5d2917cee090cc9fe1490ee740130d0e0e..1d573d843279d857788a77261007087586a3d293 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -114,6 +114,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0136-Movement-options-for-armor-stands.patch b/patches/server/0136-Movement-options-for-armor-stands.patch
index d175a4b2a..c2c2f1781 100644
--- a/patches/server/0136-Movement-options-for-armor-stands.patch
+++ b/patches/server/0136-Movement-options-for-armor-stands.patch
@@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6141ff524ac4fc1ee6bcb2b871be8c0d4b078997..02ac813cfa9bafd931a1fb2f31a0a3cd955cd5d7 100644
+index 63887de35be7b1b9076bc509b92af0b860886310..46a01989cd2d10ac4f41c7c0a86b0e915e6dbe90 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1722,7 +1722,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1723,7 +1723,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return this.isInWater() || flag;
      }
  
diff --git a/patches/server/0137-Fix-stuck-in-portals.patch b/patches/server/0137-Fix-stuck-in-portals.patch
index 7aef98ea9..18ad75c55 100644
--- a/patches/server/0137-Fix-stuck-in-portals.patch
+++ b/patches/server/0137-Fix-stuck-in-portals.patch
@@ -17,10 +17,10 @@ index 1de4f239dfb63250b7143e89e97487d048b99776..bc5d5a2a48cfc6b4257d1cc3ac73d8ec
                  // CraftBukkit end
                  this.setLevel(worldserver);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 02ac813cfa9bafd931a1fb2f31a0a3cd955cd5d7..f9111dc426a539c91665840d772258f76b6d1c76 100644
+index 46a01989cd2d10ac4f41c7c0a86b0e915e6dbe90..3753502af217ed6d06f03d250a069b1e0be7ebe5 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2870,12 +2870,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2879,12 +2879,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return Vec3.directionFromRotation(this.getRotationVector());
      }
  
diff --git a/patches/server/0157-Drowning-Settings.patch b/patches/server/0157-Drowning-Settings.patch
index 55da45376..47b6cfee5 100644
--- a/patches/server/0157-Drowning-Settings.patch
+++ b/patches/server/0157-Drowning-Settings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Drowning Settings
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index f9111dc426a539c91665840d772258f76b6d1c76..fafea41a3d05936d898da39017eb8ee8e28c520e 100644
+index 3753502af217ed6d06f03d250a069b1e0be7ebe5..ddf1fc47c3d01ec589548081ca9f01f8d6ccd642 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3101,7 +3101,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3110,7 +3110,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public int getMaxAirSupply() {
@@ -18,7 +18,7 @@ index f9111dc426a539c91665840d772258f76b6d1c76..fafea41a3d05936d898da39017eb8ee8
  
      public int getAirSupply() {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index e9ee22f12f542f0c2d1a4ecedc891d708491a8eb..4f9b44c1a1421969f454cb2984d0b7ce21357225 100644
+index 920fddcc5971915c542891e0f2a4a48e5626765f..253ee4d72d1b40a49049692bc02f6be997a2e079 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -423,7 +423,7 @@ public abstract class LivingEntity extends Entity {
diff --git a/patches/server/0185-API-for-any-mob-to-burn-daylight.patch b/patches/server/0185-API-for-any-mob-to-burn-daylight.patch
index e0d8c988d..0e060d7a7 100644
--- a/patches/server/0185-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/server/0185-API-for-any-mob-to-burn-daylight.patch
@@ -6,10 +6,10 @@ 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 fafea41a3d05936d898da39017eb8ee8e28c520e..b303008bf53ed4f4469d26465c35ec266fdd80f2 100644
+index ddf1fc47c3d01ec589548081ca9f01f8d6ccd642..2464e334de7e7f2d09e41b6b457a731239505db8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4585,5 +4585,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4593,5 +4593,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public boolean canSaveToDisk() {
          return true;
      }
@@ -31,7 +31,7 @@ index fafea41a3d05936d898da39017eb8ee8e28c520e..b303008bf53ed4f4469d26465c35ec26
      // 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 5fd7fc273f7b33e24d9b1a320c0bdd76c9ee0ac2..6959ea94bc2efc4417345365be4c506ee11c60bf 100644
+index c3dfb85ecdd4c8bd888b8511f430b70cb2e41807..5341f90a45473529095fec6f9b621949d66fa156 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -265,6 +265,7 @@ public abstract class LivingEntity extends Entity {
@@ -351,7 +351,7 @@ index f2900d76e9577c83be377500f7d7e7f438a56683..0748babe61be5e5082132af6c4a3bc82
          // Paper end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 51325f67c49680417b8b843135ec0e91481fe7fc..e24261f2ddc3de614feb9ae38e7e04c57ea7364b 100644
+index 2890ca4d1886cf1e259fd7e7e8bab7ca33036e53..df3ea1aa8c4cfc9ed575e264d4eb851ae9f5b615 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -203,6 +203,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
diff --git a/patches/server/0189-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0189-Add-toggle-for-end-portal-safe-teleporting.patch
index 95fad528a..f7394c450 100644
--- a/patches/server/0189-Add-toggle-for-end-portal-safe-teleporting.patch
+++ b/patches/server/0189-Add-toggle-for-end-portal-safe-teleporting.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add toggle for end portal safe teleporting
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b303008bf53ed4f4469d26465c35ec266fdd80f2..fda9f5113cb529237cc73159cfb27e4d935cdfe3 100644
+index 2464e334de7e7f2d09e41b6b457a731239505db8..151e573ece15fe19e5b09662a9bb7459aef7e9ae 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2921,7 +2921,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2930,7 +2930,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              }
  
              this.processPortalCooldown();
diff --git a/patches/server/0190-Flying-Fall-Damage-API.patch b/patches/server/0190-Flying-Fall-Damage-API.patch
index 2c3806a5e..548cadfbc 100644
--- a/patches/server/0190-Flying-Fall-Damage-API.patch
+++ b/patches/server/0190-Flying-Fall-Damage-API.patch
@@ -26,10 +26,10 @@ index d9fe4f09e48f67fd4b79528a38fcaef9b94269d8..38b1807c7abf7278b2d00be1e1c8e3e3
          } 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 3cc4f0020829ac935c325d5df7a16aabe26fe154..956a82b0c0837bfc49c0ea8a66b9323a4351fbc8 100644
+index 4487aef74152b0630a766293516135b3927cea7f..583a9b758c34f47126fafc55e9c37d5119d51718 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2840,5 +2840,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2847,5 +2847,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
          getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
      }
diff --git a/patches/server/0225-Extended-OfflinePlayer-API.patch b/patches/server/0225-Extended-OfflinePlayer-API.patch
index c6181919d..815e5c55f 100644
--- a/patches/server/0225-Extended-OfflinePlayer-API.patch
+++ b/patches/server/0225-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 956a82b0c0837bfc49c0ea8a66b9323a4351fbc8..a43aad1317b50b5ef42a84721f82318beccd66ea 100644
+index 583a9b758c34f47126fafc55e9c37d5119d51718..065724763100f69ab5edfd0e11ae7c8e05dfa4c9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2108,6 +2108,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2115,6 +2115,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().getAbilities().walkingSpeed * 2f;
      }
  
diff --git a/patches/server/0226-Added-the-ability-to-add-combustible-items.patch b/patches/server/0226-Added-the-ability-to-add-combustible-items.patch
index d95585820..14cce4e38 100644
--- a/patches/server/0226-Added-the-ability-to-add-combustible-items.patch
+++ b/patches/server/0226-Added-the-ability-to-add-combustible-items.patch
@@ -51,10 +51,10 @@ index c617a8aacbbefb37d53d0e005e822469d29aa642..e1abe61edfaa7b1497b5367310b49146
      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 787fa6e886c9cb9cadee15d5481ff75fbf47ec1a..0b45cfd7158af615df3f9477a8891e495c69a4fb 100644
+index 6599d84d7ff4ef54d4ee8c4f9204335c8a6a1062..d728ac0d463b72aad5ea446d4e9bdc8554264f5d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1417,6 +1417,19 @@ public final class CraftServer implements Server {
+@@ -1419,6 +1419,19 @@ public final class CraftServer implements Server {
          return true;
      }
  
diff --git a/patches/server/0245-Option-to-prevent-spiders-from-climbing-world-border.patch b/patches/server/0245-Option-to-prevent-spiders-from-climbing-world-border.patch
index 80864df0e..2a23519ae 100644
--- a/patches/server/0245-Option-to-prevent-spiders-from-climbing-world-border.patch
+++ b/patches/server/0245-Option-to-prevent-spiders-from-climbing-world-border.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Option to prevent spiders from climbing world border
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fda9f5113cb529237cc73159cfb27e4d935cdfe3..d3438154fb7d7f05e83fa7e94ad8c8f4b637f683 100644
+index 151e573ece15fe19e5b09662a9bb7459aef7e9ae..3d4d3ec099a37458d43a0500724eec7594097a41 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -304,6 +304,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -305,6 +305,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      public boolean verticalCollision;
      public boolean verticalCollisionBelow;
      public boolean minorHorizontalCollision;
@@ -16,7 +16,7 @@ index fda9f5113cb529237cc73159cfb27e4d935cdfe3..d3438154fb7d7f05e83fa7e94ad8c8f4
      public boolean hurtMarked;
      protected Vec3 stuckSpeedMultiplier;
      @Nullable
-@@ -1415,7 +1416,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -1416,7 +1417,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              io.papermc.paper.util.CollisionUtil.getCollisions(world, this, collisionBox, potentialCollisions, false, true,
                  false, false, null, null);
  
diff --git a/patches/server/0256-Allow-void-trading.patch b/patches/server/0256-Allow-void-trading.patch
index b4ec3b284..9da7ba73e 100644
--- a/patches/server/0256-Allow-void-trading.patch
+++ b/patches/server/0256-Allow-void-trading.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow void trading
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 7128bcecb9eb1677dcb54e82698a7ea65eb015b6..0192e1f5bb07095015a682ce47c27bab1cdf9a1f 100644
+index 81a0047e04f9be9dd8030fb68f2ce59c166700c1..0d82ca8ba9f2b11213cfe1ab01dc6ef3f2f510c9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -2682,7 +2682,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -2673,7 +2673,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
              // Spigot Start
              if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
                  // Paper start
diff --git a/patches/server/0280-Spark-Profiler.patch b/patches/server/0280-Spark-Profiler.patch
index ff48aebb7..e0bb56c5e 100644
--- a/patches/server/0280-Spark-Profiler.patch
+++ b/patches/server/0280-Spark-Profiler.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Spark Profiler
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0b45cfd7158af615df3f9477a8891e495c69a4fb..9b5e29d0d43f9c6ab2b06d3d49334b8429a55a41 100644
+index d728ac0d463b72aad5ea446d4e9bdc8554264f5d..7208236ee3c604620fd0d0afe49215320e45e24b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -416,7 +416,38 @@ public final class CraftServer implements Server {
+@@ -418,7 +418,38 @@ public final class CraftServer implements Server {
              if (!pluginFolder.exists()) {
                  pluginFolder.mkdirs();
              }