Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@84b5d4a Reorder bukkit damage source entity for explosion (#8553)
PaperMC/Paper@b4c1ae6 Fix MC-121048 (#8429)
PaperMC/Paper@825cb43 [ci skip] Add .fleet/ folder to .gitignore (#8574)
PaperMC/Paper@669fed4 Fix MC-179072 (#8421)
PaperMC/Paper@8f498dc Sync chunk load command improvements (#8554)
PaperMC/Paper@3299886 [ci skip] Add TheFruxz to the license MIT list (#8575)
PaperMC/Paper@0a6f100 Add more collision code skipping logic (#7581)
PaperMC/Paper@76503f8 Strip coordinates from lodestone compasses (#8561)
PaperMC/Paper@b95d4b2 Moving ATs from the at file to individual patches (#8573)
PaperMC/Paper@4a3ae59 [ci skip] Add check for git repo (#8578)
PaperMC/Paper@a7df847 Add Player Warden Warning API (#8470)
PaperMC/Paper@3ab194e Avoid a cubed max search distance for POIs (#8576)

gradle.properties

@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19.2-R0.1-SNAPSHOT
 
-paperCommit = 215111213b878f2d837032632c83fabe09000bc2
+paperCommit = 3ab194e1858c292a9f4a2df42ff833c9c91df902
 
 org.gradle.caching = true
 org.gradle.parallel = true

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index ecb8b4cf48c7d6151ffec92bc6855d1fc57a2b51..6355c9390238775b324b9f4e6795e40495ad3529 100644
+index 1e27b9de47f111b9c000243214e22890e323f7fc..5360b67d63a732e3412ae8cb0dc7631b0bed58f1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2850,4 +2850,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2903,4 +2903,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end

patches/api/0010-AFK-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 6355c9390238775b324b9f4e6795e40495ad3529..a0a108154d64a9ffd89b7ccfb692235a81637dd4 100644
+index 5360b67d63a732e3412ae8cb0dc7631b0bed58f1..edc09706c8a79d2e91440e164fc1ceb6c85d15d3 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2858,5 +2858,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2911,5 +2911,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @return True if Player uses Purpur Client
       */
      public boolean usesPurpurClient();

patches/api/0017-Player-invulnerabilities.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a0a108154d64a9ffd89b7ccfb692235a81637dd4..b4f6f2ee270ce7bfb2e63727244ca7def5fdfcb9 100644
+index edc09706c8a79d2e91440e164fc1ceb6c85d15d3..7f499e420074d7550a50e832c0b11b205012e74b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2877,5 +2877,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2930,5 +2930,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Reset the idle timer back to 0
       */
      void resetIdleTimer();

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

@@ -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 b4f6f2ee270ce7bfb2e63727244ca7def5fdfcb9..8d1bdf02266799c9ca33ec72a6c063856916e3fc 100644
+index 7f499e420074d7550a50e832c0b11b205012e74b..d56f4f177919a501a5fa4ba544ea6500694cf9d2 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2898,5 +2898,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2951,5 +2951,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param invulnerableTicks Invulnerable ticks remaining
       */
      void setSpawnInvulnerableTicks(int invulnerableTicks);

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

@@ -260,10 +260,10 @@ index 8effbbd33c0af0ac421e5aef1586e8579ef097e4..0cd49cb31b21e52009f6220d505aa2a3
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8d1bdf02266799c9ca33ec72a6c063856916e3fc..d2e749b08ab660ffc8ed50e4243cdb4da3447611 100644
+index d56f4f177919a501a5fa4ba544ea6500694cf9d2..36eaa0c8d63eaf7f4c5ff40155b109f064f21553 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2912,5 +2912,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2965,5 +2965,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @return True if fall damage is enabled when {@link #getAllowFlight()} is true
       */
      public boolean hasFlyingFallDamage();

patches/api/0052-Add-death-screen-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 876eb0540f328073d8e44e9f75089d945f0a523d..9c2dcca0b6e34a3083226360575f0956a077d767 100644
+index caf710fbfa91c2e2bba51ad395cf14cec91feb21..93e18658bb7a83a35f812811c2c87630a4b7eb0b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2990,5 +2990,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3043,5 +3043,21 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Clears all debug block highlights
       */
      void clearBlockHighlights();

patches/server/0001-Pufferfish-Server-Changes.patch

@@ -1460,7 +1460,7 @@ index 63ec2ebb71aa0e0dbb64bbce7cd3c9494e9ce2e7..d03551e81e3ef37935cb1d963aba3df3
          }
      }
 diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
-index e63dc33250831428c2cef34e02238600231fb815..c8f7aa9e0794713724e1053581c220aa95f1bc90 100644
+index dacb00c7cb2702ae8e9c6be61ca08e41bd6009e4..b5d4c53bf1046fa52da5398491258b94f1e0fcd0 100644
 --- a/src/main/java/io/papermc/paper/util/MCUtil.java
 +++ b/src/main/java/io/papermc/paper/util/MCUtil.java
 @@ -209,7 +209,7 @@ public final class MCUtil {
@@ -1524,7 +1524,7 @@ index ff3eced0e20c39b825586897ee2fed01dd471d88..5c54a5da7fb50cd97799c5fa280a24d5
          }
      }
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index d1edafb3e44a4d17586e0e9c4fca30389b529074..bf2998947f4165f9a661c8fc5f6b846ab9852370 100644
+index 55d8ced734a408c990c6c4fbc81707bcb1f27daa..65327b58bced011efb117e546fd6657092b76035 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -334,7 +334,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -1576,7 +1576,7 @@ index d1edafb3e44a4d17586e0e9c4fca30389b529074..bf2998947f4165f9a661c8fc5f6b846a
              return this.scaledRange(i);
          }
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index be97d38f45046a7f6d2337d879651f04cf9ff825..0b75caca3f77980505d0689601d920fb50f7ac4d 100644
+index 4ff563d903633f181e1268daa77f250cfec204a0..014255019ce3f22e0c8cf8f0a775669f909d18f4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -75,6 +75,9 @@ public class ServerChunkCache extends ChunkSource {
@@ -1692,7 +1692,7 @@ index 2358bb1788cfb902bac9b3b7588954af2d2cd823..163f14b4e1ca99d75e5d8e14190f7b91
                          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 8b3e703ebb497b9166bd211b4247a78891b61aeb..94f4a5bfd2af8389a99f80bab4eceac1f075512e 100644
+index feb0a6d6a90850977b393440881c472c317a9323..a32fd708349d13a4ed0a67ddcad0716fcf8443ab 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -727,7 +727,20 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1749,7 +1749,7 @@ index 8b3e703ebb497b9166bd211b4247a78891b61aeb..94f4a5bfd2af8389a99f80bab4eceac1
              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 33dd46022be9a4b70ec05c202d9f27b43d09467f..42862061cbd6ca8c34d3fc6ff90145f418becbb9 100644
+index d31a345edfffe39f127073fc3aec8b3489bae79c..187791ff8197be015856fdfa9159fb26558f95cf 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1216,6 +1216,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2087,7 +2087,7 @@ index 72516335570d7137a62ec8667a6e8f06f024692f..b44322c337bcded94c60e1761a389101
      public final String id;
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 0318c9483a4d96eb39ff4df9054a9e6398186bc3..26efc49b4530112c8bd3f580ce375ab4203c9609 100644
+index 3bfa0c6a0d82ed980b3289051892a6d1745ebb69..84caca55518464ac4fdf7dfe766bcaf00a9da227 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -142,7 +142,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -2145,7 +2145,7 @@ index 0318c9483a4d96eb39ff4df9054a9e6398186bc3..26efc49b4530112c8bd3f580ce375ab4
      public boolean onClimbable() {
          if (this.isSpectator()) {
              return false;
-@@ -3586,7 +3607,10 @@ public abstract class LivingEntity extends Entity {
+@@ -3607,7 +3628,10 @@ public abstract class LivingEntity extends Entity {
              Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ());
  
              // Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists
@@ -2158,7 +2158,7 @@ index 0318c9483a4d96eb39ff4df9054a9e6398186bc3..26efc49b4530112c8bd3f580ce375ab4
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index fffa6ba329b38433a1df51df339df652d3fda828..e89b88eb3d4202ea7ff043dc9e92163332cd10d3 100644
+index cf40ebd06c52a7a00e6f704a29ae9d2b5186d35a..26fabc96d3c3ac4ea35d094c686975b19c428d7f 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -210,14 +210,16 @@ public abstract class Mob extends LivingEntity {
@@ -2261,7 +2261,7 @@ index 42d466f7f162943886078eba3db18f2dfc2d7bee..6c0dda1ce018ec6bb2ebb97147045fff
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
-index a910189177da0c1134c954b3d81b9e9bc4bc1420..0cc0d719e95e108263683b7a40f4ce3a8ca9465b 100644
+index 1805aacd982dae8d971cfad0ead23c161badb095..bc3defa2c2ca0971ce3d9642a38380973a82de46 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
 @@ -50,9 +50,12 @@ public class GoalSelector {
@@ -3506,7 +3506,7 @@ index ebe65474a4a05ff1637d7f37ebcfe690af59def5..42142c512b12e5b269c19f1e821c50e7
  
      @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4212568bf8de6988c71f43d3e2152fa0fe51d0d7..85d94f47792bbd63c4c4ee8fa4a88abc4c440286 100644
+index 07eac5439164a7345476c55277538a152359630a..a4848a507f620cff686992c2e95039ca60af6d0e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper
@@ -3569,7 +3569,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 40b382c2e0e33fe5c24a51b211cd2f9557a60c5e..70b5b307193dc288a6257d90ca96762cb4a8345a 100644
+index 1b42c98956342832c37f0aa266f85271daa4ba5b..4e978e12130d685257f408247c4b61a3909fde80 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;

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 5819e8e5e3c6f87eb123cf16091ea74357d53b3b..a56e79c852eaec4fbd7e428076323b01fda3463b 100644
+index 3b122f521c166253f20d233c0fcebdede6660be5..f927090ed59b483124076c6d4eed4b55ac5c61d6 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -261,6 +261,7 @@ public class ServerPlayer extends Player {
@@ -17,7 +17,7 @@ index 5819e8e5e3c6f87eb123cf16091ea74357d53b3b..a56e79c852eaec4fbd7e428076323b01
      public boolean isRealPlayer; // Paper
      public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 21c482725d2504b0aedb83ed2a7954b19c11bb61..9dc8a6570e95b4d281c9a28e441e4931058f155e 100644
+index 187791ff8197be015856fdfa9159fb26558f95cf..15075c8705929de83adaf0f7afe7a7cfd40150ae 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -3648,6 +3648,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -43,10 +43,10 @@ index 21c482725d2504b0aedb83ed2a7954b19c11bb61..9dc8a6570e95b4d281c9a28e441e4931
              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 66830ccee464083879f79db4111e08fecee417ec..4708e516b0a4946b6e02ac4b3ba1c48ba3f8cd11 100644
+index a5220a4e514865c70700527bcd2f941d852564c0..26a05a8835934093054e76057572f3f69410134d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2948,4 +2948,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2983,4 +2983,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.spigot;
      }
      // Spigot end

patches/server/0008-Ridables.patch

@@ -34,7 +34,7 @@ index 0eb4a5b18dcaccd37c2b2c71dbc000aeba559a1a..19b9b7deac4d8f125008526cc115375c
  
              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 46f7aa594ff43063d9e7066d5015611ba0fa90ea..3de05d160490ed373ee15f8724e9b1a46500f301 100644
+index 4e0aed7902b6f184441000975d88202cce5040e8..3887126b59e13fc42e096adab29caf726711da00 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -220,6 +220,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -46,7 +46,7 @@ index 46f7aa594ff43063d9e7066d5015611ba0fa90ea..3de05d160490ed373ee15f8724e9b1a4
          final Throwable thr = new Throwable(entity + " Added to world at " + new java.util.Date());
          io.papermc.paper.util.StacktraceDeobfuscator.INSTANCE.deobfuscateThrowable(thr);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9091241c21715e2bbe43a11ba637ec7759e7a43a..c347e5df53355b88bf3f69c0d4e95b48678e95dc 100644
+index 836347984b99341a619b919dd82e11666e9ed878..d35eee8011e0c1a8b2885054597cfd88b1192795 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -674,6 +674,15 @@ public class ServerPlayer extends Player {
@@ -66,7 +66,7 @@ index 9091241c21715e2bbe43a11ba637ec7759e7a43a..c347e5df53355b88bf3f69c0d4e95b48
  
      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 9dc8a6570e95b4d281c9a28e441e4931058f155e..8fd3571d49c376ab675f1256d1aea60ec500289d 100644
+index 15075c8705929de83adaf0f7afe7a7cfd40150ae..6ec78e1efff939755b163ab88405e17ba646e706 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2915,6 +2915,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -194,7 +194,7 @@ index c1e9b40a4a0f9cdc650caa88b5ea132e06ee2496..882ab40c8cdea8c214cb8344b3ccecdd
      protected ParticleOptions getInkParticle() {
          return ParticleTypes.GLOW_SQUID_INK;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 26efc49b4530112c8bd3f580ce375ab4203c9609..f7d194069b0ef3b4b0a6f360c2b00a2f22d5bcc3 100644
+index 84caca55518464ac4fdf7dfe766bcaf00a9da227..4ac4c6de004111dde2a7e61b35ff80be2a3eb053 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -220,9 +220,9 @@ public abstract class LivingEntity extends Entity {
@@ -227,7 +227,7 @@ index 26efc49b4530112c8bd3f580ce375ab4203c9609..f7d194069b0ef3b4b0a6f360c2b00a2f
  
      @Override
      protected void checkFallDamage(double heightDifference, boolean onGround, BlockState state, BlockPos landedPosition) {
-@@ -2673,7 +2674,7 @@ public abstract class LivingEntity extends Entity {
+@@ -2675,7 +2676,7 @@ public abstract class LivingEntity extends Entity {
      }
  
      protected long lastJumpTime = 0L; // Paper
@@ -236,7 +236,7 @@ index 26efc49b4530112c8bd3f580ce375ab4203c9609..f7d194069b0ef3b4b0a6f360c2b00a2f
          double d0 = (double) this.getJumpPower() + this.getJumpBoostPower();
          Vec3 vec3d = this.getDeltaMovement();
          // Paper start
-@@ -3404,8 +3405,10 @@ public abstract class LivingEntity extends Entity {
+@@ -3417,8 +3418,10 @@ public abstract class LivingEntity extends Entity {
          this.pushEntities();
          this.level.getProfiler().pop();
          // Paper start
@@ -249,7 +249,7 @@ index 26efc49b4530112c8bd3f580ce375ab4203c9609..f7d194069b0ef3b4b0a6f360c2b00a2f
                  Location from = new Location(this.level.getWorld(), this.xo, this.yo, this.zo, this.yRotO, this.xRotO);
                  Location to = new Location (this.level.getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
                  io.papermc.paper.event.entity.EntityMoveEvent event = new io.papermc.paper.event.entity.EntityMoveEvent(this.getBukkitLivingEntity(), from, to.clone());
-@@ -3415,6 +3418,21 @@ public abstract class LivingEntity extends Entity {
+@@ -3428,6 +3431,21 @@ public abstract class LivingEntity extends Entity {
                      absMoveTo(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch());
                  }
              }
@@ -272,7 +272,7 @@ index 26efc49b4530112c8bd3f580ce375ab4203c9609..f7d194069b0ef3b4b0a6f360c2b00a2f
          // Paper end
          if (!this.level.isClientSide && this.isSensitiveToWater() && this.isInWaterRainOrBubble()) {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index e89b88eb3d4202ea7ff043dc9e92163332cd10d3..1ffef9219dd62575b1e3e53770eb3814eff3f6eb 100644
+index 26fabc96d3c3ac4ea35d094c686975b19c428d7f..088a44dfc798e4fad4e20f0dea344abae606242c 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -146,8 +146,8 @@ public abstract class Mob extends LivingEntity {
@@ -349,7 +349,7 @@ index e89b88eb3d4202ea7ff043dc9e92163332cd10d3..1ffef9219dd62575b1e3e53770eb3814
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
-index 9bce290eb0c2cfef4896a3f2076c80bf3d76bd56..00fc98797aea23e1f586b8e7f85fc27e2019352f 100644
+index 59ca3a0a70c68263495ae9972215b76554d3fb83..2c915c765ceef3ec28f5a58fa9a587282c1a906a 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
 @@ -22,15 +22,22 @@ public class AttributeMap {
@@ -4743,7 +4743,7 @@ index 1fb11985dcfd07ded1f7cadf3fdba7d23ca4f87b..9970c2c09b294e601b7cda4f1e8cbf2a
          this.level.getProfiler().pop();
          this.updateActivity();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index dc9402e343d3bc0b0d38e3a7834521a976f89c39..fb291a8a792dfd48c70d38b12b2733566ba62506 100644
+index e0e16d3b4ba0afc3cfc66b93ecf5f889599f48dd..2040da30822f6f24f6de96bd47f2f8cb4cd2a266 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -105,11 +105,30 @@ public class Zombie extends Monster {
@@ -5066,7 +5066,7 @@ index 93077e8c6b5a35adc6febb749d1d08be172402f1..a6519bf96f39fa69ecb65ef25dba8026
                          this.startTrading(player);
                      }
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index af092098cdfc528bd9f5d771ead1b685aa051bee..bb710e97a515d25a5835805cadfca48b2f1f916a 100644
+index 8a4107067938f7ca990a7edd1e271d57cfdb0545..204567f3ce802a0f757d7270b046f905641b0cfb 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 @@ -66,6 +66,23 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
@@ -5105,7 +5105,7 @@ index af092098cdfc528bd9f5d771ead1b685aa051bee..bb710e97a515d25a5835805cadfca48b
                      this.setTradingPlayer(player);
                      this.openTradingScreen(player, this.getDisplayName(), 1);
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 9b131f0a827413e9f5d6d0f7491c5481576cb8b1..307733914109c4eb1a10ffccf169e70c3baa2bc9 100644
+index 0ea101f155936f7c340d9e1d1077c58b72551027..b7e62e74f3f9c65cb6bca5130b2ae73b2c1fb939 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -198,6 +198,19 @@ public abstract class Player extends LivingEntity {

patches/server/0012-AFK-API.patch

@@ -68,7 +68,7 @@ index d35eee8011e0c1a8b2885054597cfd88b1192795..e00aa16f51ec065cdce13dff0926d87e
          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 e21646cb6975615fb7a76251e5e1c969990c0036..c6448b2281b01aa445f58b289f893c100df01935 100644
+index 6ec78e1efff939755b163ab88405e17ba646e706..c37b4000321807ad3c2400019e0be0e6fd3d4301 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -342,6 +342,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -182,7 +182,7 @@ index e752c83df50fb9b670ecea2abc95426c2a009b6f..baa4f9026d31de92210300ecb8ee8c1b
              if (baseEntity == null) {
                  if (this.isCombat && (!targetEntity.canBeSeenAsEnemy() || targetEntity.level.getDifficulty() == Difficulty.PEACEFUL)) {
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 7d0dcb65544ac20faa5dceb5cb97191b06f3800b..265d6b766001cdb8e8b9bc8538119637dd92cd17 100644
+index 86c0d7e9775042901d01528f9b55298344ea0ff5..d71250144abcb613598e1b795d096b9c740e3169 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -202,6 +202,13 @@ public abstract class Player extends LivingEntity {
@@ -213,7 +213,7 @@ index 87beea39636b641dc5b46c2755a00285b7671ac5..95931a038d3c845048b1ffaadd1e930a
                  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 4708e516b0a4946b6e02ac4b3ba1c48ba3f8cd11..ce1111150c2e82ba5daa8783e18078e1a70988c7 100644
+index 26a05a8835934093054e76057572f3f69410134d..622d0234f5ad1b21aa02e585e3b838368bcd1799 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -522,10 +522,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -233,7 +233,7 @@ index 4708e516b0a4946b6e02ac4b3ba1c48ba3f8cd11..ce1111150c2e82ba5daa8783e18078e1
          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()));
-@@ -2954,5 +2959,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2989,5 +2994,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean usesPurpurClient() {
          return getHandle().purpurClient;
      }
@@ -305,7 +305,7 @@ index b411ba7283b8d6abf7cf53c3c82b612c801ebbee..657dfaa9cf2990fcade8739d3e1c3f9e
      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 70b5b307193dc288a6257d90ca96762cb4a8345a..2fec279d8880e310cbddea2eb12e2fc4baf99d8c 100644
+index 4e978e12130d685257f408247c4b61a3909fde80..e8233eb0e69a5263ee9f153a3a2eee3936011262 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -203,6 +203,7 @@ public class ActivationRange

patches/server/0019-Player-invulnerabilities.patch

@@ -82,7 +82,7 @@ index e00aa16f51ec065cdce13dff0926d87e49561c8b..1e50d6abb4ff9337ea3266b131d63a37
      public Scoreboard getScoreboard() {
          return this.getBukkitEntity().getScoreboard().getHandle();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c6448b2281b01aa445f58b289f893c100df01935..abb1a20156b70781ccfd4ce15ffcfa0228b41a7d 100644
+index c37b4000321807ad3c2400019e0be0e6fd3d4301..deb2027df156d3daab9b999bc20ad4da7c03b8a4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2101,12 +2101,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -121,10 +121,10 @@ index c8742e5e7fdb89a2239a4fc52e76a19cf367bff6..989f7ad99f52891b40febc6f988f9394
          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 ce1111150c2e82ba5daa8783e18078e1a70988c7..78e36e1ac3e79ff4f01a3f5b3183956c9223f7e2 100644
+index 622d0234f5ad1b21aa02e585e3b838368bcd1799..e4bb7fcda60eb5382fa9248f6b9900df2b518a37 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2974,5 +2974,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3009,5 +3009,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleTimer() {
          getHandle().resetLastActionTime();
      }

patches/server/0059-Configurable-void-damage-height-and-damage.patch

@@ -5,7 +5,7 @@ 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 c6db4b825df3a296ac309dddfc07575f1bb4e79b..5e4562062bd557e4726afdcd06ec6436dde60ef5 100644
+index ad8e766c1b8262e9130fca3bd753b0cc6628db35..2ac6152896928b58d722355e24188b43b8b4d190 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -890,7 +890,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -18,10 +18,10 @@ index c6db4b825df3a296ac309dddfc07575f1bb4e79b..5e4562062bd557e4726afdcd06ec6436
              && (!(this instanceof Player player) || !player.getAbilities().invulnerable))) {
              // 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 29d33251d0b712b141c2ed8c78d0913b7b924c3c..1f0f31269fa21348cd8617a8e2d098dc2a8d0f85 100644
+index 2256491ae00f43c3b49b43fcbcf6e0d60141adff..4ffe3171067a448128644a9501b6160625870459 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2491,7 +2491,7 @@ public abstract class LivingEntity extends Entity {
+@@ -2493,7 +2493,7 @@ public abstract class LivingEntity extends Entity {
  
      @Override
      protected void outOfWorld() {

patches/server/0065-Implement-elytra-settings.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Implement elytra settings
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 1f0f31269fa21348cd8617a8e2d098dc2a8d0f85..8401577ee010c211c99c174bc70536d606a09b1d 100644
+index 4ffe3171067a448128644a9501b6160625870459..44af2badf212f740ca7a7b24b960f86fef359588 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3465,7 +3465,16 @@ public abstract class LivingEntity extends Entity {
+@@ -3478,7 +3478,16 @@ public abstract class LivingEntity extends Entity {
                      int j = i / 10;
  
                      if (j % 2 == 0) {
@@ -54,7 +54,7 @@ index 88306f54c0f8ee83020d94f20b62762910c9e9b2..736259c76dfc15784d678d2ed8074b71
                      itemStack.shrink(1);
                      } else ((net.minecraft.server.level.ServerPlayer) user).getBukkitEntity().updateInventory();
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 3d1ba3d3b12fe649e451b6c8a3726c6991cfe083..2b2115d218a279245f8be5e0c93a2b6200f81241 100644
+index 399a155fb49e4af144e3296b4ad0c55588c9be5b..9e308183917884dcb2f8831324d45c9aeef55051 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -564,7 +564,7 @@ public final class ItemStack {

patches/server/0076-Allow-color-codes-in-books.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow color codes in books
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 8610f4d46e0512b391ebcc209366308730e654c7..a431d7d1e72092e9274507b3ed463bfdeb3583f5 100644
+index f10488344791bcc3be15538b75ad211b4858b520..76aae9b733b6c7becd37a2176a68a19c008ebb8e 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1342,13 +1342,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -29,7 +29,7 @@ index 8610f4d46e0512b391ebcc209366308730e654c7..a431d7d1e72092e9274507b3ed463bfd
              this.updateBookPages(pages, (s) -> {
                  return Component.Serializer.toJson(Component.literal(s));
 @@ -1360,10 +1363,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
-     public void updateBookPages(List<FilteredText> list, UnaryOperator<String> unaryoperator, ItemStack itemstack, int slot, ItemStack handItem) { // CraftBukkit
+     private void updateBookPages(List<FilteredText> list, UnaryOperator<String> unaryoperator, ItemStack itemstack, int slot, ItemStack handItem) { // CraftBukkit
          ListTag nbttaglist = new ListTag();
  
 +        // Purpur start

patches/server/0182-API-for-any-mob-to-burn-daylight.patch

@@ -31,7 +31,7 @@ index b0a3d8f7b1b1ad02e11eede0dd4dd88c75ea93ca..cb51ff789d0de27a3cb81ccb863897e4
      // 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 bbeeee00e63b1ab72608d723f828a066d0621aec..d63ac92dce259322bbb5fa6f94ca4c85b7f533eb 100644
+index 324ad2c199f2df99248785321e3127a4685a839b..13b912df3d653b8c74e5e9f4bc73790316a2b5c8 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -264,6 +264,7 @@ public abstract class LivingEntity extends Entity {
@@ -62,7 +62,7 @@ index bbeeee00e63b1ab72608d723f828a066d0621aec..d63ac92dce259322bbb5fa6f94ca4c85
      }
  
      // CraftBukkit start
-@@ -3483,6 +3490,27 @@ public abstract class LivingEntity extends Entity {
+@@ -3496,6 +3503,27 @@ public abstract class LivingEntity extends Entity {
              this.hurt(DamageSource.DROWN, 1.0F);
          }
  
@@ -91,7 +91,7 @@ index bbeeee00e63b1ab72608d723f828a066d0621aec..d63ac92dce259322bbb5fa6f94ca4c85
  
      public boolean isSensitiveToWater() {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 22f4cd68dc7f41441aae803c51adc90eb00e5977..d0c52f9cd2001aa14c04684c24ef32f07e55c905 100644
+index 7273474e296618663d3fbba813891197bc8480f8..8c534ea4b461550c14c6d5ee131e5650784c2e0f 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1685,17 +1685,7 @@ public abstract class Mob extends LivingEntity {
@@ -275,7 +275,7 @@ index 6b7baf977972b624c5745820d5c3a4375c6854b0..f032a45969d6835a36e2c7598425bc09
      // Paper end
      private static enum AttackPhase {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 27b2c48b7c8d82f3971bb6b456c1b1c5fb0266c8..b687f30720a92485d36faec8dcd865ee6cfc6ab9 100644
+index 0eaa8119201cae52340a1a58700906eb96e2a99f..f9e6f1788ae5e02372140a40373b4dec31e5d7d3 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -94,11 +94,12 @@ public class Zombie extends Monster {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Flying Fall Damage API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 2270ef3d2c0982dda203ae2517b6d9121135637a..8106457a149d2a28872fc81aba7bb595aa491f21 100644
+index 3e8334e4d7164a286ae3c497dbb1aa61521df0dd..853c005a6dffe93f47acc30166282287234ca4e0 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -188,6 +188,7 @@ public abstract class Player extends LivingEntity {
@@ -26,10 +26,10 @@ index 2270ef3d2c0982dda203ae2517b6d9121135637a..8106457a149d2a28872fc81aba7bb595
          } 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 d588f1b7670af21512295e446c15812cd9e2f6a2..26af7578809970e3073699db2c118872b05b512f 100644
+index c1c5c0edab6dc204dd0e7de09af31f8b3b95ad86..98a08e304ddd9628101fc90bfa8201b11792fc16 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2999,5 +2999,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3034,5 +3034,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
          getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
      }

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Toggle for kinetic damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index d63ac92dce259322bbb5fa6f94ca4c85b7f533eb..7422b01a63e395cb87f02a1a665f53b11755f5ee 100644
+index 13b912df3d653b8c74e5e9f4bc73790316a2b5c8..ce57fb82a5229cccdd2ecac9a80013dec8331c68 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2883,6 +2883,7 @@ public abstract class LivingEntity extends Entity {
+@@ -2885,6 +2885,7 @@ public abstract class LivingEntity extends Entity {
  
                      if (f3 > 0.0F) {
                          this.playSound(this.getFallDamageSound((int) f3), 1.0F, 1.0F);

patches/server/0288-Remove-Mojang-Profiler.patch

@@ -371,7 +371,7 @@ index 30093cd8bd35f0bbc8f26eca370622ee12a046b6..2986f110348b376bcdc64fa39b688855
  
                  ++j;
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 6d819e330f55ddf7e2ccf2f615543f4c9eca1f71..2182ee049defee88067aa61cee42d3a0122061b7 100644
+index fac291c9a48b2563d33fe7250e57556aa29ec669..ceaa44e8fbf02aef36f5ae663269dfc1026e4086 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -606,20 +606,20 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -400,7 +400,7 @@ index 6d819e330f55ddf7e2ccf2f615543f4c9eca1f71..2182ee049defee88067aa61cee42d3a0
  
      public boolean hasWork() {
 diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 2af21158dfb44a49f15c07d765a09335f76ed3dd..9d13ef8c597b9ca11280ad1d3249d13bbab4ac6f 100644
+index 6a11e522c5bd9042dcf89e2538d354448e501fbe..3bee0bfc481ffe3ea1860c5b23ad2efbe81cb0ba 100644
 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
 @@ -430,16 +430,16 @@ public class ServerChunkCache extends ChunkSource {
@@ -538,7 +538,7 @@ index 2af21158dfb44a49f15c07d765a09335f76ed3dd..9d13ef8c597b9ca11280ad1d3249d13b
          }
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 550c3566b14aace0dbd4e77876abc2bb663bcf5c..c888e654ab9449bfdc7dfe16078eb0786ae6c15e 100644
+index a242d1d51784c5e22464c3c23cd45b62e338f5fd..55dfc1e2d7653a474aefed403dc67016aaa77514 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -653,12 +653,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -754,7 +754,7 @@ index 550c3566b14aace0dbd4e77876abc2bb663bcf5c..c888e654ab9449bfdc7dfe16078eb078
  
                  while (iterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 8c83b0fc6d6db5e145ec4c1bcd035e8b06aa37bf..f3ea3860bda768a8bed4175fd993b708f3ab5de4 100644
+index f6032bc75aaad33e183804a7dea5423720e2ae55..d4bebb739d8ff19a610be6775ee25ede4bce2a8c 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1157,7 +1157,7 @@ public class ServerPlayer extends Player {
@@ -787,7 +787,7 @@ index 8c83b0fc6d6db5e145ec4c1bcd035e8b06aa37bf..f3ea3860bda768a8bed4175fd993b708
                  this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities()));
                  playerlist.sendLevelInfo(this, worldserver);
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3503b7defe826db564370dbab78a8c91f5156d20..d74ee9e75eaf3b012c61b93e2b6f6a36a592688a 100644
+index 66c89b3c3668cfc0d427bca85918dbd7fc7089af..7bdc02e997b67c4b579f226ed5ea7f1465dd8546 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -416,7 +416,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1013,7 +1013,7 @@ index 5725c6593480fada65facc29664a00a8cc073512..ccb1f998ae3122d1856d77149ff7e7df
              };
          }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6019072c354220fb07e14e746d925956e1ed37f0..d266d35e3c975a843c3f4f6d6857249280dd2811 100644
+index ef8d7c0c922cdc9e4ee857144677990c90c663ba..6c8a5126c45aec13dc881a1998bdbb0f11bb9688 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -821,7 +821,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1139,7 +1139,7 @@ index 6019072c354220fb07e14e746d925956e1ed37f0..d266d35e3c975a843c3f4f6d68572492
              }
          } else {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 4cdf6954c8f428df7ca91abd497416797ae246c5..2de1d338267dc69fdd509abe50145996dc9cd35a 100644
+index cd70cf663f0fb2ddcbd637e8260dc994f3be258b..d0c8c39ff78637de14bfdfef78d74f4035bfb6a4 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -396,7 +396,7 @@ public abstract class LivingEntity extends Entity {
@@ -1160,7 +1160,7 @@ index 4cdf6954c8f428df7ca91abd497416797ae246c5..2de1d338267dc69fdd509abe50145996
      }
  
      public boolean canSpawnSoulSpeedParticle() {
-@@ -3088,10 +3088,10 @@ public abstract class LivingEntity extends Entity {
+@@ -3090,10 +3090,10 @@ public abstract class LivingEntity extends Entity {
          }
  
          this.run += (f3 - this.run) * 0.3F;
@@ -1174,7 +1174,7 @@ index 4cdf6954c8f428df7ca91abd497416797ae246c5..2de1d338267dc69fdd509abe50145996
  
          // Paper start - stop large pitch and yaw changes from crashing the server
          this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
-@@ -3103,7 +3103,7 @@ public abstract class LivingEntity extends Entity {
+@@ -3105,7 +3105,7 @@ public abstract class LivingEntity extends Entity {
          this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F;
          // Paper end
  
@@ -1183,7 +1183,7 @@ index 4cdf6954c8f428df7ca91abd497416797ae246c5..2de1d338267dc69fdd509abe50145996
          this.animStep += f2;
          if (this.isFallFlying()) {
              ++this.fallFlyTicks;
-@@ -3385,19 +3385,19 @@ public abstract class LivingEntity extends Entity {
+@@ -3398,19 +3398,19 @@ public abstract class LivingEntity extends Entity {
          }
  
          this.setDeltaMovement(d4, d5, d6);
@@ -1208,7 +1208,7 @@ index 4cdf6954c8f428df7ca91abd497416797ae246c5..2de1d338267dc69fdd509abe50145996
          if (this.jumping && this.isAffectedByFluids()) {
              double d7;
  
-@@ -3424,8 +3424,8 @@ public abstract class LivingEntity extends Entity {
+@@ -3437,8 +3437,8 @@ public abstract class LivingEntity extends Entity {
              this.noJumpDelay = 0;
          }
  
@@ -1219,7 +1219,7 @@ index 4cdf6954c8f428df7ca91abd497416797ae246c5..2de1d338267dc69fdd509abe50145996
          this.xxa *= 0.98F;
          this.zza *= 0.98F;
          this.updateFallFlying();
-@@ -3434,8 +3434,8 @@ public abstract class LivingEntity extends Entity {
+@@ -3447,8 +3447,8 @@ public abstract class LivingEntity extends Entity {
          // SpigotTimings.timerEntityAIMove.startTiming(); // Spigot // Paper
          this.travel(new Vec3((double) this.xxa, (double) this.yya, (double) this.zza));
          // SpigotTimings.timerEntityAIMove.stopTiming(); // Spigot // Paper
@@ -1230,7 +1230,7 @@ index 4cdf6954c8f428df7ca91abd497416797ae246c5..2de1d338267dc69fdd509abe50145996
          boolean flag1 = this.getType().is(EntityTypeTags.FREEZE_HURTS_EXTRA_TYPES);
          int i;
  
-@@ -3455,15 +3455,15 @@ public abstract class LivingEntity extends Entity {
+@@ -3468,15 +3468,15 @@ public abstract class LivingEntity extends Entity {
              this.hurt(DamageSource.FREEZE, (float) i);
          }
  
@@ -1250,7 +1250,7 @@ index 4cdf6954c8f428df7ca91abd497416797ae246c5..2de1d338267dc69fdd509abe50145996
          // Purpur start
          if (this.xo != this.getX() || this.yo != this.getY() || this.zo != this.getZ() || this.yRotO != this.getYRot() || this.xRotO != this.getXRot()) {
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index d0c52f9cd2001aa14c04684c24ef32f07e55c905..d5e3bd662da349fc2ee58c7800d79c60300f33b3 100644
+index 8c534ea4b461550c14c6d5ee131e5650784c2e0f..bc18c166ca776b0ef6e816eb034e410c391258b6 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -332,14 +332,14 @@ public abstract class Mob extends LivingEntity {
@@ -1356,7 +1356,7 @@ index d0c52f9cd2001aa14c04684c24ef32f07e55c905..d5e3bd662da349fc2ee58c7800d79c60
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
-index 0cc0d719e95e108263683b7a40f4ce3a8ca9465b..872ec431ae6beb0ef603d833f38aedb9d87e5466 100644
+index bc3defa2c2ca0971ce3d9642a38380973a82de46..cbe957013d958d10ed6707a3785893f6856b9c3f 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
 @@ -102,8 +102,8 @@ public class GoalSelector {
@@ -1660,10 +1660,10 @@ index 20668d53625ec88ba3eb2a655ad3f6bc4fb0fd0e..b1a4b83fc248ae2f0a8852e60f9cd448
              this.assignProfessionWhenSpawned = false;
          }
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
-index 01477e7240f9e33d08d416a7d40ee10f3e5d4abf..c9def2202d7c2a523858ec124df2beaf994d9888 100644
+index 31708d1e94b557896d42199aa0bc6ed26a4c6d8a..e9245a476936590f165a1e5c42515218d7572906 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
 +++ b/src/main/java/net/minecraft/world/level/Explosion.java
-@@ -363,7 +363,7 @@ public class Explosion {
+@@ -366,7 +366,7 @@ public class Explosion {
                  if (!iblockdata.isAir() && iblockdata.isDestroyable()) { // Paper
                      BlockPos blockposition1 = blockposition.immutable();
  
@@ -1672,7 +1672,7 @@ index 01477e7240f9e33d08d416a7d40ee10f3e5d4abf..c9def2202d7c2a523858ec124df2beaf
                      if (block.dropFromExplosion(this)) {
                          Level world = this.level;
  
-@@ -385,7 +385,7 @@ public class Explosion {
+@@ -388,7 +388,7 @@ public class Explosion {
  
                      this.level.setBlock(blockposition, Blocks.AIR.defaultBlockState(), 3);
                      block.wasExploded(this.level, blockposition, this);
@@ -1746,7 +1746,7 @@ index 5e3acd365d9aca4271a590564e3eaad0d268bf11..0bb14272d024af90e7aef40f2f694e18
      }
  
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 724f034d92f9f3f1021802e2bc2a845146c45efa..e882996b64178d2e22aeaf6f6a16a05eb715362d 100644
+index 2d19db940d4f1624631cec29547e88842a4cfb98..5b5c18f70a989da6bff77485692a4ceef9a6f08d 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -131,7 +131,7 @@ public final class NaturalSpawner {
@@ -1768,7 +1768,7 @@ index 724f034d92f9f3f1021802e2bc2a845146c45efa..e882996b64178d2e22aeaf6f6a16a05e
  
      // Paper start
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 434e33aa5c1c9722ea065627f1559c833954a342..7bae0525cc48d531de5a949f038417e098a59443 100644
+index 772a2dc21071a3f687b51fbddf9f12a90d41ce79..2877441927de3aeba28f5c3dd876e2ae4c15797c 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -1309,9 +1309,9 @@ public class LevelChunk extends ChunkAccess {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Debug Marker API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 39126cfe915c5e5777813b14ceab6427205b2a76..43b9d766a592d58b304c375a23173538f0e3959b 100644
+index 621461cedbdad4b28da7047e3c26cc9ed60e1439..9883c5732cb136194c5d11fbe76f66fd234e3f82 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1468,6 +1468,42 @@ public final class CraftServer implements Server {
@@ -52,7 +52,7 @@ index 39126cfe915c5e5777813b14ceab6427205b2a76..43b9d766a592d58b304c375a23173538
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 0462ed0da625b3d1ee6f5fb6c219a593309f4f9e..fbab5e57565b8f9bc071d02933447f749a6bf5e3 100644
+index c43be63f65c4cec94d19e3a75cf05d5d6f75c4d3..41fafd4a1583e748d763439e8838739ec1ff8e1d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2238,6 +2238,42 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -99,10 +99,10 @@ index 0462ed0da625b3d1ee6f5fb6c219a593309f4f9e..fbab5e57565b8f9bc071d02933447f74
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e36cecf68195a0177aad2590705b9920d66efcb3..897597dbd38b7433c9e414ed71269d48cf2d2c41 100644
+index 6d45052c9fd8cecfd76eae3c8bea55cdfa3b58a5..d5631b08a44812c1ebf737277c74c85fdee0d2ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3030,5 +3030,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3065,5 +3065,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean hasFlyingFallDamage() {
          return getHandle().flyingFallDamage;
      }

patches/server/0296-Fix-MC-179072.patch

@@ -5,12 +5,12 @@ Subject: [PATCH] Fix MC-179072
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java
-index 19540fd4a7f992888fadb6501d0c8a5a7e71fcf6..8562cbfa258499bc04e5ffbcb4402dfc78ed20c3 100644
+index e241ae250f4f04a17ef2c583d00b065a4ca56a4c..77ba04d270abc87460f09730887aa8079b7cf8d3 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java
-@@ -21,6 +21,13 @@ public class SwellGoal extends Goal {
+@@ -28,6 +28,13 @@ public class SwellGoal extends Goal {
-         return this.creeper.getSwellDir() > 0 || livingEntity != null && this.creeper.distanceToSqr(livingEntity) < 9.0D;
      }
+     // Paper end
  
 +    // Purpur start
 +    @Override

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

@@ -30,10 +30,10 @@ index 53b75f5737a910ffc5448cd9a85eae57f9c1488f..ea95873dd034779e56a8b924cd27f937
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a432feb58be5947688502e7b4e3e81cf09eb3f47..bd363cd808f294f47298258ee7b99aeb36150887 100644
+index 9c513b2db3a377e3eff7b042db6bb7139a9d1246..6c816179a2fef2c913580339eb68040e5af3fd92 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3080,5 +3080,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3115,5 +3115,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (this.getHandle().connection == null) return;
          this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket(ClientboundCustomPayloadPacket.DEBUG_GAME_TEST_CLEAR, new FriendlyByteBuf(io.netty.buffer.Unpooled.buffer())));
      }

patches/server/0311-Add-option-to-allow-creeper-to-encircle-target-when-.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to allow creeper to encircle target when fusing.
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java
-index 8562cbfa258499bc04e5ffbcb4402dfc78ed20c3..00c89879a4f679d814cb5c381e57bc4d3dc5323b 100644
+index 77ba04d270abc87460f09730887aa8079b7cf8d3..5d1964bd66443f1b4ade1632e4673fea6824d828 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/SwellGoal.java
-@@ -54,6 +54,14 @@ public class SwellGoal extends Goal {
+@@ -61,6 +61,14 @@ public class SwellGoal extends Goal {
              this.creeper.setSwellDir(-1);
          } else {
              this.creeper.setSwellDir(1);