Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@52a60ad Updated Upstream (Bukkit/CraftBukkit) (#8172)
PaperMC/Paper@5deafd1 Teleportation API (#6562)

gradle.properties

@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.19-R0.1-SNAPSHOT
 
-paperCommit = d0e7fa4dc95adf25d01736194a389e768250537f
+paperCommit = 5deafd1969b3c521af9cabb46822ecb01e6ce498
 
 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 c0fc38cacf441273e8430dda31958c15a48fc9b6..8bcf8ca71101988342d4c01c6943977d14ea60b6 100644
+index b39afbcd1fa88a7f00cd5f4482d52f2d089497dc..d9b0c214ab906e458b042a6762f5c84a8b98e55d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2705,4 +2705,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2770,4 +2770,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end

patches/api/0007-Ridables.patch

@@ -22,10 +22,10 @@ index 8fd399f791b45eb7fc62693ca954eea0c68e2881..22705359d5b3b1af522ff5575c07ca5e
       * @deprecated removed in 1.16
       */
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 8bc6876c82935988436597161fa0ec94c032174b..db83f87af0cb75b275bba306dea38b66907bbb56 100644
+index 03b35d3ba8ba00c0fa0272450f19355244a014ea..79990a193443ed4c619a25ae1b4c18d46e8dcc83 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -830,4 +830,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -897,4 +897,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      boolean isInPowderedSnow();
      // Paper 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 8bcf8ca71101988342d4c01c6943977d14ea60b6..a262a1d3c2ad43ab163817967e06e7067cba3733 100644
+index d9b0c214ab906e458b042a6762f5c84a8b98e55d..4aa9b09749763298bbdc93c87fb353c7fe40dd8a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2713,5 +2713,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2778,5 +2778,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 a262a1d3c2ad43ab163817967e06e7067cba3733..3f032de55933706c4fc054e58605e1ffd18a3bf5 100644
+index 4aa9b09749763298bbdc93c87fb353c7fe40dd8a..395b4e7218e5f252f81d098264a2a917c63c12b0 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2732,5 +2732,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2797,5 +2797,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Reset the idle timer back to 0
       */
      void resetIdleTimer();

patches/api/0028-Rabid-Wolf-API.patch

@@ -17,13 +17,13 @@ index 2a8c6da0f9ffa1f94cfd37d1068511c8941d27ce..aa0a081819672c14d9f04c07f4685768
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Wolf.java b/src/main/java/org/bukkit/entity/Wolf.java
-index 297b65a6cf7d25f02bbd824ea507c5c083e0abec..f5f751678f3d14d2dcb8727c7e9d9db1ab1a44a7 100644
+index 84db38388bf7a58e66d6cd29620b4fe64b0a897e..82ebd99549ce9f9e6427a50cef424e9007735708 100644
 --- a/src/main/java/org/bukkit/entity/Wolf.java
 +++ b/src/main/java/org/bukkit/entity/Wolf.java
-@@ -59,4 +59,20 @@ public interface Wolf extends Tameable, Sittable, io.papermc.paper.entity.Collar
+@@ -69,4 +69,20 @@ public interface Wolf extends Tameable, Sittable, io.papermc.paper.entity.Collar
+      * @param interested Whether the wolf is interested
       */
-     boolean isInterested();
+     public void setInterested(boolean interested);
-     // Paper end
 +
 +    // Purpur start
 +    /**

patches/api/0034-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/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index db83f87af0cb75b275bba306dea38b66907bbb56..3fa4f583c8d38c8cb62065f7f18986c985e4c92f 100644
+index 79990a193443ed4c619a25ae1b4c18d46e8dcc83..ffd3d7f4c0c86806bcf70bd90edf3041834d401c 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -860,5 +860,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -927,5 +927,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       * @return True if ridable in water
       */
      boolean isRidableInWater();

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 3f032de55933706c4fc054e58605e1ffd18a3bf5..2436ece75493dc05352dfa0027b98aaeaab0d5f7 100644
+index 395b4e7218e5f252f81d098264a2a917c63c12b0..8bf04a0ad920fa580568713b243c20c448435908 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2753,5 +2753,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2818,5 +2818,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param invulnerableTicks Invulnerable ticks remaining
       */
      void setSpawnInvulnerableTicks(int invulnerableTicks);

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

@@ -17,10 +17,10 @@ index 353463084d90eb684717e65c56da52cd25a1e375..6b63a8e880e93866e12e90769951bfcd
      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 d42e220347cb39d7f0e04f9f47403bb1914e164d..5574fdf7001d3bfc8ebef9af38039318125d0ba5 100644
+index 1581215f7e8348e40d248c8e3d5ef43143e69579..19cbccc56a526d597bd9124d38c84a85f6ad237d 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
+@@ -3381,6 +3381,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      private static final ResourceLocation CUSTOM_UNREGISTER = new ResourceLocation("unregister");
  
      private static final ResourceLocation MINECRAFT_BRAND = new ResourceLocation("brand"); // Paper - Brand support
@@ -28,7 +28,7 @@ index d42e220347cb39d7f0e04f9f47403bb1914e164d..5574fdf7001d3bfc8ebef9af38039318
  
      @Override
      public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
-@@ -3399,6 +3400,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3405,6 +3406,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
                  ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t unregister custom payload", ex);
                  this.disconnect("Invalid payload UNREGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause
              }
@@ -43,10 +43,10 @@ index d42e220347cb39d7f0e04f9f47403bb1914e164d..5574fdf7001d3bfc8ebef9af38039318
              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 287520f91e22309e1268be1940e0fafb628980a9..00c9bf988de09a6214a7ac21acfeb288862900c2 100644
+index d7ba155d9485128f4c7ad8ab4a2b7302a86aeb67..123295c56e638d4b97196b62dfe79822c9002242 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2796,4 +2796,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2875,4 +2875,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.spigot;
      }
      // Spigot end

patches/server/0008-Ridables.patch

@@ -46,7 +46,7 @@ index 4094d08d478a98cb4ff13ff3274ad0d88cd46e85..be388b21b256ba68e42b8f998722ef5d
          return new Throwable(entity + " Added to world at " + new java.util.Date());
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 3ed1bd3f9a75056c040a3563533d53ad4438b962..2842ba7028bf833478758f2e839796b25084b1b3 100644
+index 6ddcb6cce953efd869ddf48b57bbd42f060bed01..96e7815bde8274d303b1b7080358a3f7f1837146 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -668,6 +668,15 @@ public class ServerPlayer extends Player {
@@ -66,10 +66,10 @@ 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 5574fdf7001d3bfc8ebef9af38039318125d0ba5..b639bb8582389c7f675fb9a7f60aebb9615b766e 100644
+index 19cbccc56a526d597bd9124d38c84a85f6ad237d..472a5dac726c77caa34b2f1343495cae4a9e2e98 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
+@@ -2668,6 +2668,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
                          ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event);
  
@@ -79,7 +79,7 @@ index 5574fdf7001d3bfc8ebef9af38039318125d0ba5..b639bb8582389c7f675fb9a7f60aebb9
                          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 3a8f78ad1037b2bae3ab1ae40cbc25f4acafbc93..4733085d0782b80f9d74db7adc0929440cac3d47 100644
+index 254ec6a7a742003df0e9ac1e92fe1930d4bf5a3d..b294ebd7f7a327756f2925b8418d755d7db4aa0d 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -362,7 +362,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -702,7 +702,7 @@ index 1f85f34c1e50f34fb270d2fac7d307c82a550bfa..324f52edd95b5f9a498e46def8c14435
                  double d = this.wantedX - this.fish.getX();
                  double e = this.wantedY - this.fish.getY();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index bd048cc30046f19f9eee89c6ba45d0816a160e67..1458079a5ffa8b4a50d30cfc01fa1b27b6a46f37 100644
+index 23b8c9838b860b132ea043b7507ebc2220a49640..15c8fcb3df7ae30fecdfc367904a6fe12a7143ad 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -43,6 +43,7 @@ import net.minecraft.world.entity.EntityType;
@@ -2317,7 +2317,7 @@ index fdd2c63ff0017bafa544a3cff2ee6d2d62c92cb3..32b31e5efb5fc68430b9bcd4cd972494
  
          }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
-index 9e17e21a48892686e94a1c21b636695ab84eb7cd..c88222d120c71649b2e43a20f119590106734596 100644
+index 9a2d1285c207290946ae664915a77b8f9dc00ad7..952d8da2d5bc35aba52b9b63c3cf0e7b2c81f157 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
 @@ -83,16 +83,65 @@ public class Frog extends Animal {
@@ -3345,7 +3345,7 @@ index 8c328d72c42ccaa6891249cc700b70bb34c09545..a5250d7a85f11c58732d7e3d3ca3321e
          }
          // Paper end
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-index 1b1305f5eaf5710b72c57ab4c3953e703a23f1e0..869a2ee5e0775cc477fb56063dfa4ce4a0c6e3f2 100644
+index 30a67a1eef9238e12e54c57a0608387cc0f763ef..af1a6cd77e70141be8b6507e1494babaeab3828c 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 @@ -68,6 +68,23 @@ public class Drowned extends Zombie implements RangedAttackMob {
@@ -4082,7 +4082,7 @@ index 682beb556bbe2b74c0a08e780fa25dcb301c281c..e3e1743e4a8d6ddccdbd08351b3524e6
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index f747aa85beab98fbecdbe15b188be6614478bac6..fe4f2690a562601ca64e4969beadc65516edc7b2 100644
+index a0eee7dc73bd4a96d9a1aa9555093820c5f7c49c..ad5fa8d9146262d569255994c7c7df80efacd5f1 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 @@ -69,14 +69,39 @@ public class Ravager extends Raider {
@@ -4635,10 +4635,10 @@ index a9e75a16a7dc0ff5d4f0faa92ebc444559a39325..c0421de54b2d192d67c54cef359f6b12
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, true));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-index f9eb4a3a37454de78c65f895a82e67a854b6909b..7775f1428a455f0d52f43ed07102cb242f6d23ad 100644
+index b7bc64818387288955d0723cd071d4203bd2f121..f15b93f24adfa72d6d2271b67ecca0996df2d870 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-@@ -59,6 +59,23 @@ public class Witch extends Raider implements RangedAttackMob {
+@@ -56,6 +56,23 @@ public class Witch extends Raider implements RangedAttackMob {
          super(type, world);
      }
  
@@ -4662,7 +4662,7 @@ index f9eb4a3a37454de78c65f895a82e67a854b6909b..7775f1428a455f0d52f43ed07102cb24
      @Override
      protected void registerGoals() {
          super.registerGoals();
-@@ -67,10 +84,12 @@ public class Witch extends Raider implements RangedAttackMob {
+@@ -64,10 +81,12 @@ public class Witch extends Raider implements RangedAttackMob {
          });
          this.attackPlayersGoal = new NearestAttackableWitchTargetGoal<>(this, Player.class, 10, true, false, (Predicate) null);
          this.goalSelector.addGoal(1, new FloatGoal(this));
@@ -4775,7 +4775,7 @@ index 97b3082dc020043fa38d9e5e4591102f97519ed3..be664e96a63bf6042375654e8297e4d6
      }
  
 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 7fe5908020c4577c1e4d6c00af382cf536351d96..457de9aa4e049682f37421e3d83e7a7b09f66675 100644
+index cff0ed9ae6e79f84870343e43574f384dd73ea88..0838dc70da3a56730820ed0685d250f10296e377 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 @@ -78,6 +78,23 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
@@ -5143,10 +5143,10 @@ 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 2a6c67634c31c332102d24bef293da1bacd0c000..158e1a61e9cc2661a09f6c4edb7db16464ca2e6d 100644
+index b80cc0938b2b3928f4450f1314a9fbd7ea9c116b..b8cb317246b1f07c193abac9b5c84acdfe9ef958 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 {
+@@ -1340,4 +1340,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return getHandle().isInPowderSnow || getHandle().wasInPowderSnow; // depending on the location in the entity "tick" either could be needed.
      }
      // Paper end
@@ -5219,7 +5219,7 @@ index 03d389f3458cd77166a0319fa38c7207e8714e6f..cc0f6a51e10c77928fccf372a45a56aa
              event = new EntityDamageEvent(damagee.getBukkitEntity(), cause, modifiers, modifierFunctions);
          }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index e784bc02ee6bf9848396a1e3a3af58b0b959b0d3..52747a0ca0578dd302a8297bed04a568a9e1fc13 100644
+index 6dbb2e10ed244845fe9f857b237589900ea3cf40..5aee512c0a5a0b5f5fac4214f682b398a1e85862 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -167,4 +167,9 @@ public class PurpurConfig {

patches/server/0009-Configurable-entity-base-attributes.patch

@@ -5,7 +5,7 @@ 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 4733085d0782b80f9d74db7adc0929440cac3d47..1a6786565e5da5418423e9cb937a966a0755a0f9 100644
+index b294ebd7f7a327756f2925b8418d755d7db4aa0d..fd3df46348e217a73b3975d703a7381890569c71 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -156,7 +156,7 @@ import org.bukkit.plugin.PluginManager;
@@ -78,7 +78,7 @@ index 2edc11b093dbfc96d287dc9d3e208cc2a39c537e..007c945725721ddb8a3dc4b8085e8c68
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index 1458079a5ffa8b4a50d30cfc01fa1b27b6a46f37..0fb1aa7bfbadc5e2df34391a4c9f0d045d576740 100644
+index 15c8fcb3df7ae30fecdfc367904a6fe12a7143ad..6efcad6eb77390771ef360cb04de1efd06d85549 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -214,6 +214,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -808,7 +808,7 @@ index a5250d7a85f11c58732d7e3d3ca3321efac42fc0..0bf2355b7ac80227c06b3e85f1645559
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-index 869a2ee5e0775cc477fb56063dfa4ce4a0c6e3f2..4b58ca48deda0410edf9ad3c9079858d5a31a762 100644
+index af1a6cd77e70141be8b6507e1494babaeab3828c..9e7ea6be928fb536c9898a85bb0a9ad40af25bd5 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 @@ -83,6 +83,16 @@ public class Drowned extends Zombie implements RangedAttackMob {
@@ -1067,7 +1067,7 @@ index e3e1743e4a8d6ddccdbd08351b3524e6e2bed38c..13c0c270dc56f0e3d6e60714a3b9abeb
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index fe4f2690a562601ca64e4969beadc65516edc7b2..647e0fbd0ff54944fbe7e2a9a6ac40a32919359c 100644
+index ad5fa8d9146262d569255994c7c7df80efacd5f1..6d1d682d193b630706731ba6d4a44955e8a0a2e7 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 @@ -90,6 +90,11 @@ public class Ravager extends Raider {
@@ -1265,10 +1265,10 @@ index c0421de54b2d192d67c54cef359f6b12d2d013c1..c3b8bce2d8e1dccb619267923964e06a
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-index 7775f1428a455f0d52f43ed07102cb242f6d23ad..0359db7ccca286df046066b4a2356a50b8240a56 100644
+index f15b93f24adfa72d6d2271b67ecca0996df2d870..c4ee1bca68b26403b6671c8c5f7fc3f037ad1128 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-@@ -74,6 +74,11 @@ public class Witch extends Raider implements RangedAttackMob {
+@@ -71,6 +71,11 @@ public class Witch extends Raider implements RangedAttackMob {
      public boolean isControllable() {
          return level.purpurConfig.witchControllable;
      }
@@ -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 457de9aa4e049682f37421e3d83e7a7b09f66675..6d5251228128c38961fa6714b8569fa5e764c36d 100644
+index 0838dc70da3a56730820ed0685d250f10296e377..efbcf6dd43fa9ce368978f568dcfd6887c3f9742 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 {

patches/server/0013-AFK-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 2842ba7028bf833478758f2e839796b25084b1b3..faaf63fe5afd825de34a5c4c586d106f859d0d47 100644
+index 96e7815bde8274d303b1b7080358a3f7f1837146..a11030df2eaaae4a0b5710f4d5d32033c30be9b1 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -2006,8 +2006,58 @@ public class ServerPlayer extends Player {
@@ -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 b639bb8582389c7f675fb9a7f60aebb9615b766e..250182281905fd9f02491a5dcd03cd3091a80029 100644
+index 472a5dac726c77caa34b2f1343495cae4a9e2e98..bd7769c9511685bbf96e5bb80108a99508cb82d4 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 00c9bf988de09a6214a7ac21acfeb288862900c2..d95fd0174a067d53c2c08ec2bf6758bce6ce944c 100644
+index 123295c56e638d4b97196b62dfe79822c9002242..271387c0f5e011846507a0dd8dbf2445ca2ff7ed 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 00c9bf988de09a6214a7ac21acfeb288862900c2..d95fd0174a067d53c2c08ec2bf6758bc
          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()));
-@@ -2802,5 +2807,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2881,5 +2886,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean usesPurpurClient() {
          return getHandle().purpurClient;
      }
@@ -255,7 +255,7 @@ index 00c9bf988de09a6214a7ac21acfeb288862900c2..d95fd0174a067d53c2c08ec2bf6758bc
      // Purpur end
  }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index b079c084e47019938546bf9156178a077a0e2022..9839fb413d06b5dfc1d89a4aee4d05e53d613232 100644
+index 8a7144a65594236a1ec7187348285174594d7a97..cf7925c5631815a53926543b79179c58e923402e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -169,8 +169,16 @@ public class PurpurConfig {

patches/server/0020-Player-invulnerabilities.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index faaf63fe5afd825de34a5c4c586d106f859d0d47..9397f5ff682a344282bcea2f6273ecbdcfe8ce1e 100644
+index a11030df2eaaae4a0b5710f4d5d32033c30be9b1..70fe7e8a0e67c1c32cc33846c26020fe5b81f711 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 {
@@ -82,10 +82,10 @@ index faaf63fe5afd825de34a5c4c586d106f859d0d47..9397f5ff682a344282bcea2f6273ecbd
      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 250182281905fd9f02491a5dcd03cd3091a80029..770585c0ba9db619941b2562b34371cc1d167cb8 100644
+index bd7769c9511685bbf96e5bb80108a99508cb82d4..b51608b2eaaaa4bf4b89fbd379aa649c3a219c38 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2003,12 +2003,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2009,12 +2009,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
      @Override
      public void handleResourcePackResponse(ServerboundResourcePackPacket packet) {
          PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
@@ -108,7 +108,7 @@ index 250182281905fd9f02491a5dcd03cd3091a80029..770585c0ba9db619941b2562b34371cc
          this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
          // Paper end
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 1e4be9af14b305aed38a7a3cf38a4659ba3aeb18..407bcae5459cbc6c670f7f44dd8bb593935ffffa 100644
+index 5f5ec3269a5856aa9e00df475901f5d13da3c6f6..f8699be5fed37f86445f9ee513e737ba6bcec161 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1007,6 +1007,8 @@ public abstract class PlayerList {
@@ -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 d95fd0174a067d53c2c08ec2bf6758bce6ce944c..b82d150f9b634c5a69cf60e6d1daee9b561cd51b 100644
+index 271387c0f5e011846507a0dd8dbf2445ca2ff7ed..c5cb4060bbe39f6ae73170369e807789bfb2ae54 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2822,5 +2822,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2901,5 +2901,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void resetIdleTimer() {
          getHandle().resetLastActionTime();
      }

patches/server/0023-Alternative-Keepalive-Handling.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Alternative Keepalive Handling
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 474944b20fb81e9e4ed42ec2895673c98bc36420..e2f57af54380c7afa5c6ac00c8aba74e838465c4 100644
+index b51608b2eaaaa4bf4b89fbd379aa649c3a219c38..da310a616bf5edd2dd9a0b4cbadd5ffec0f22315 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -245,6 +245,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -38,7 +38,7 @@ index 474944b20fb81e9e4ed42ec2895673c98bc36420..e2f57af54380c7afa5c6ac00c8aba74e
          if (this.keepAlivePending) {
              if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
                  ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info
-@@ -3360,6 +3376,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3366,6 +3382,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
      @Override
      public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
@@ -56,7 +56,7 @@ index 474944b20fb81e9e4ed42ec2895673c98bc36420..e2f57af54380c7afa5c6ac00c8aba74e
          if (this.keepAlivePending && packet.getId() == this.keepAliveChallenge) {
              int i = (int) (Util.getMillis() - this.keepAliveTime);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 3b417ecebe7bb621aee76d5155d97695c826f4a6..8124b27f043beb763d70881593a883e06ea59f6e 100644
+index c8e4ab0302c2cc4bac858169d68adc48c2047026..20b86de8b204df1636b76073c434f5e436f77379 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -191,6 +191,11 @@ public class PurpurConfig {

patches/server/0080-Entity-lifespan.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Entity lifespan
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c84cb931a78390fd485b95e8c9b9904de920f254..3dc6c7158e1030fc2b3cbc84adb06eab2f921a7b 100644
+index 4ec4528df23aa2576dc1806213a50317afa820a8..aa10ec38cec63dfbb8b01da2c898f35eda7219bf 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2717,6 +2717,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2723,6 +2723,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
              }
  
              if (entity.distanceToSqr(this.player.getEyePosition()) < ServerGamePacketListenerImpl.MAX_INTERACTION_DISTANCE) {

patches/server/0122-Spread-out-and-optimise-player-list-ticksSpread-out-.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Spread out and optimise player list ticksSpread out and
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index db23e2afd1b9a7a8e1b29e48a31441b0a64beb5d..dea412353ba3e997d8024cb0770b9ac7300b63a1 100644
+index 43306f8dca74f40797d27b8c8842dd9a06aa1ce6..9b4fa8bac4d8316848c82401ce5c36a6b4b10671 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1021,22 +1021,22 @@ public abstract class PlayerList {
@@ -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 b82d150f9b634c5a69cf60e6d1daee9b561cd51b..e8ec6547c11248a2bcc92bbd6226a264f3a51234 100644
+index c5cb4060bbe39f6ae73170369e807789bfb2ae54..c852d5374bb7af1fd97b8d16a7fbea0a677fbad6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1741,7 +1741,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1820,7 +1820,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public boolean canSee(org.bukkit.entity.Entity entity) {

patches/server/0123-Configurable-chance-for-wolves-to-spawn-rabid.patch

@@ -201,13 +201,13 @@ index 28e35304e76b26af734fcfbccef8f43143345576..f862d83db6127804b9254a33a73e6f18
              return super.mobInteract(player, hand);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
-index a3bec00368aef0f8cc6aa21cce1389938d15f91b..704667760ab1593647e3f03bdd17ad325366642c 100644
+index e43fd3e59fd8c74828ae65965fade27f56beef65..b2f133c8baabba1cffa6e92ea0f854532f4c181b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
-@@ -54,4 +54,16 @@ public class CraftWolf extends CraftTameableAnimal implements Wolf {
+@@ -63,4 +63,16 @@ public class CraftWolf extends CraftTameableAnimal implements Wolf {
-         return this.getHandle().isInterested();
+     public void setInterested(boolean flag) {
+         this.getHandle().setIsInterested(flag);
      }
-     // Paper end
 +
 +    // Purpur start
 +    @Override

patches/server/0134-Add-EntityTeleportHinderedEvent.patch

@@ -78,13 +78,13 @@ 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 158e1a61e9cc2661a09f6c4edb7db16464ca2e6d..2890ca4d1886cf1e259fd7e7e8bab7ca33036e53 100644
+index b8cb317246b1f07c193abac9b5c84acdfe9ef958..3c3c9578f511987f8c237306647d04e8b57099e1 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 {
+@@ -593,6 +593,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
-         location.checkFinite();
+         // Paper end
  
-         if (this.entity.isVehicle() || this.entity.isRemoved()) {
+         if ((!ignorePassengers && this.entity.isVehicle()) || this.entity.isRemoved()) { // Paper - Teleport passenger API
 +            // Purpur start
 +            if (!entity.isRemoved() && new org.purpurmc.purpur.event.entity.EntityTeleportHinderedEvent(entity.getBukkitEntity(), org.purpurmc.purpur.event.entity.EntityTeleportHinderedEvent.Reason.IS_VEHICLE, cause).callEvent())
 +                return teleport(location, cause);
@@ -93,13 +93,13 @@ index 158e1a61e9cc2661a09f6c4edb7db16464ca2e6d..2890ca4d1886cf1e259fd7e7e8bab7ca
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e8ec6547c11248a2bcc92bbd6226a264f3a51234..4487aef74152b0630a766293516135b3927cea7f 100644
+index c852d5374bb7af1fd97b8d16a7fbea0a677fbad6..36ed9d6f513998c0183d19fdc3be17ad0413e613 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1158,6 +1158,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1237,6 +1237,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
  
-         if (entity.isVehicle()) {
+         if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API
 +            // Purpur start
 +            if (new org.purpurmc.purpur.event.entity.EntityTeleportHinderedEvent(entity.getBukkitEntity(), org.purpurmc.purpur.event.entity.EntityTeleportHinderedEvent.Reason.IS_VEHICLE, cause).callEvent())
 +                return teleport(location, cause);

patches/server/0138-Toggle-for-water-sensitive-mob-damage.patch

@@ -37,7 +37,7 @@ index 007c945725721ddb8a3dc4b8085e8c68da741b93..53ef2004d1b6acaf27fef9a658fff99b
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index eaff4f966b4d82749df9e96246c078301fd4801b..2cea3d633209665d0cab2b211b817e3bbd61d3a2 100644
+index fa71241df0b291fedf7ff0a70dc9dc375f65b8a8..cf2515ecea8bb2fefaf025977a705d9545f85e21 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -176,7 +176,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -641,7 +641,7 @@ index 6acdd443e1e9d59efab8966f5f3ddbfb7be72336..fa4d5579dcdaad04fa2e6cd9ae47af11
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-index 1d57ee963416e784a759f2ecee7b7c380f0597eb..037d77b47d0be69dfeda01f4a0d52ad72aea2c8d 100644
+index dbf1c0704788136f4f8a893460f57ba6d3f42780..8e7e94779f034e036110365f4200540a89910fd0 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 @@ -108,6 +108,11 @@ public class Drowned extends Zombie implements RangedAttackMob {
@@ -855,7 +855,7 @@ index 13c0c270dc56f0e3d6e60714a3b9abeb6413c74f..d2dc2b73692ddf28272b1196a6ed718f
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index 02b0c732b17f8992c040f095c410d526e1faa62a..14b2d1adabcdf9281f314e3cd185ea22353e614e 100644
+index 570b3cbfc66f762999eaec57109ec11c995707b2..ca14d2702f6a4b5c1be2a24a146723232a2d19ef 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 @@ -95,6 +95,11 @@ public class Ravager extends Raider {
@@ -1021,10 +1021,10 @@ index 021550a0465dd1fd152b4c2e763014058730e8ca..b9b2e76535da32965615de563d4674ce
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-index 0359db7ccca286df046066b4a2356a50b8240a56..801355c7c3a4acfb3c45b0d5bc3218e948f72e10 100644
+index c4ee1bca68b26403b6671c8c5f7fc3f037ad1128..e6a3da524b8d6f776d541d1ae46f572c4f12d785 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-@@ -79,6 +79,11 @@ public class Witch extends Raider implements RangedAttackMob {
+@@ -76,6 +76,11 @@ public class Witch extends Raider implements RangedAttackMob {
      public void initAttributes() {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.witchMaxHealth);
      }

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 4487aef74152b0630a766293516135b3927cea7f..583a9b758c34f47126fafc55e9c37d5119d51718 100644
+index 36ed9d6f513998c0183d19fdc3be17ad0413e613..3511205ab5953d7c5b342aebccfb88958e8e7b97 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2847,5 +2847,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2926,5 +2926,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
          getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
      }

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 583a9b758c34f47126fafc55e9c37d5119d51718..065724763100f69ab5edfd0e11ae7c8e05dfa4c9 100644
+index 3511205ab5953d7c5b342aebccfb88958e8e7b97..619e73ff2270bbfab93c11dabdae95c601362342 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2115,6 +2115,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2194,6 +2194,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().getAbilities().walkingSpeed * 2f;
      }
  

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

@@ -36,10 +36,10 @@ index 28105d2d6d7e97c57246f7142c3bc2d593cf4ed0..af8cde5c413ee1ee410c728f56b4a24e
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 9aa0c7eddccb7a81834582f4f50e7f6b93a688e8..65fe07e77745ec0c950117e8057368159833736c 100644
+index 975e94a1768abfbe0abc238500893c3640d9af31..7cb4c25d52a08a4f1cb08f47cd66da083459d371 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -1999,6 +1999,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2005,6 +2005,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
              boolean cancelled;
              if (movingobjectposition == null || movingobjectposition.getType() != HitResult.Type.BLOCK) {

patches/server/0240-Signs-allow-color-codes.patch

@@ -17,10 +17,10 @@ index b95685e13130a214165acccbe287c249ca73f1bf..60873c874abbeff8f30b3536f5c4cc03
          this.connection.send(new ClientboundBlockUpdatePacket(this.level, sign.getBlockPos()));
          this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos()));
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 65fe07e77745ec0c950117e8057368159833736c..526d4d796fbcabcdc574dada718f904809a6dbf4 100644
+index 7cb4c25d52a08a4f1cb08f47cd66da083459d371..d1f238e2803ab080b7db1d01b399939e8c134c73 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -3384,11 +3384,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -3390,11 +3390,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
              for (int i = 0; i < signText.size(); ++i) {
                  FilteredText<Component> filteredtext = (signText.get(i)).map(Component::literal); // CraftBukkit - decompile error
  

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

@@ -37,7 +37,7 @@ index a851aaf84085c9bd79e933246bb2c79e435ab0f1..1436f9f62ce20b39c5ae2425c2fe47f5
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index a7189aff3d36efaee2c41336361960d3c9fa6f72..c3680aa6d92b0adb104d144875cea679084e36f2 100644
+index 457827e79e776c5d029fb0b603c237232364d636..85f07b0a10ab1f02befc5065d898a7dbf8d37ef4 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -229,6 +229,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -613,7 +613,7 @@ index b19e130b56839c261dd71bbf62b052ede5fb7227..fb342992e6033bcd001faf7e0bf9c0fa
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-index 6e0a575a95ac0bcbc9e3909178ea566a158dd561..68e31cf561f3d76bce6fa4324a75594c776f8964 100644
+index c9665576a658d0e996c788ceb12fd26ab786f9bc..3c841029197eeca960f033acf7d450145e72e0bd 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 @@ -114,6 +114,11 @@ public class Drowned extends Zombie implements RangedAttackMob {
@@ -821,7 +821,7 @@ index d2dc2b73692ddf28272b1196a6ed718f2f14e116..ce123b46723ceeadb7751f7998ac01eb
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index 1c821c354184a57d54a2976e5e00eb9ed0cefb72..98daeeb7545217347522a5edeef9178dcab62acf 100644
+index 1ca7058e59e42d58c5a670021f74546acf76ca36..ccf219587461224a027b567b6f05c73711009c14 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 @@ -100,6 +100,11 @@ public class Ravager extends Raider {
@@ -981,10 +981,10 @@ index b9b2e76535da32965615de563d4674cee4abd7f0..efbfe0a151686f00051026113c4d1f4d
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-index 801355c7c3a4acfb3c45b0d5bc3218e948f72e10..7a59a1834cf07933215bdee56dda9a94ddd8bd85 100644
+index e6a3da524b8d6f776d541d1ae46f572c4f12d785..d308c2bed67977bd6fd2a4509f9a13ae2af9025f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-@@ -84,6 +84,11 @@ public class Witch extends Raider implements RangedAttackMob {
+@@ -81,6 +81,11 @@ public class Witch extends Raider implements RangedAttackMob {
      public boolean isSensitiveToWater() {
          return this.level.purpurConfig.witchTakeDamageFromWater;
      }

patches/server/0277-Add-log-suppression-for-sent-expired-chat.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add log suppression for sent expired chat
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5868d67e0bc5a8f75b6719d727abac6f83a1513a..35b7e40810dce7fcde0e750df8ab8b6f8285c4e3 100644
+index d1f238e2803ab080b7db1d01b399939e8c134c73..f15d956c727c9d356f1d616aee34121690944807 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2248,7 +2248,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2254,7 +2254,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
              }); // Paper - push to main
              return false;
          } else {
@@ -18,7 +18,7 @@ index 5868d67e0bc5a8f75b6719d727abac6f83a1513a..35b7e40810dce7fcde0e750df8ab8b6f
              }
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 72019819584bf7b48c7cdcbba569c0f7a9d1bfb2..093e994f7f7e78c5bb2e38324ff89e231e1da8ee 100644
+index 8caf0861433263086dbae6f13b5fa6a36de68843..d0b4ea0212b6a5ccba029c124be1ca3ffafd5d26 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -431,11 +431,13 @@ public class PurpurConfig {

patches/server/0281-Option-to-disable-kick-for-out-of-order-chat.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Option to disable kick for out of order chat
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 35b7e40810dce7fcde0e750df8ab8b6f8285c4e3..3bb51f34be4341c991487a78d8793f074ffdcba4 100644
+index f15d956c727c9d356f1d616aee34121690944807..cb64b26bd1fbc267e6857a44d3b76933c431aa5f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2268,7 +2268,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2274,7 +2274,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
          do {
              instant1 = (Instant) this.lastChatTimeStamp.get();
              if (timestamp.isBefore(instant1)) {
@@ -18,7 +18,7 @@ index 35b7e40810dce7fcde0e750df8ab8b6f8285c4e3..3bb51f34be4341c991487a78d8793f07
          } while (!this.lastChatTimeStamp.compareAndSet(instant1, timestamp));
  
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 093e994f7f7e78c5bb2e38324ff89e231e1da8ee..2cbf20aeb5d3a2c01c57f4bf525aef13f2a65ab3 100644
+index d0b4ea0212b6a5ccba029c124be1ca3ffafd5d26..d44b8ce90db7c6c27f71aa841d6fb64b159b7b42 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 @@ -447,9 +447,11 @@ public class PurpurConfig {

patches/server/0288-Chat-Preview-API.patch

@@ -28,10 +28,10 @@ index d07bb2d1f365cb7c92a1252b83210fa38cbeeb1d..d307fd9656c2067eb70c5031dd250dc8
      };
  
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 3a4c6c91222ad6c60d1263ca7f912b1e3a85c164..ac527a253e2c238099cb3755fe5ab4855289d6f5 100644
+index cb64b26bd1fbc267e6857a44d3b76933c431aa5f..38cd5aec3c54984c3c3429aa0bfb525ba170f116 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2512,7 +2512,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
+@@ -2518,7 +2518,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
  
      @Override
      public void handleChatPreview(ServerboundChatPreviewPacket packet) {