we can ride mobs again!

2026-02-17 08:27:43 +01:00 · 2023-06-08 19:58:32 -07:00
parent c74414fe7a
commit 0b3c94c72d
292 changed files with 1843 additions and 1756 deletions
--- a/patches/todo/server/0008-Ridables.patch
+++ b/patches/todo/server/0008-Ridables.patch
--- a/patches/server/0010-AFK-API.patch
+++ b/patches/server/0010-AFK-API.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] AFK API
 Adds the option for display names to be used in the afk broadcast

 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 15539499b5a0f16ad2d44c39c5b824876fdf0951..a1e43e2b05217a3345d048da05fbcfd506522809 100644
+index dfdc50093e5d4b60438acfc12ab9f14255fa7a99..3b6af7b76db3d550eb7f199f9e8afd1c0af97e2e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2107,8 +2107,68 @@ public class ServerPlayer extends Player {
+@@ -2116,8 +2116,68 @@ public class ServerPlayer extends Player {
 
     public void resetLastActionTime() {
         this.lastActionTime = Util.getMillis();
@@ -79,7 +79,7 @@ index 15539499b5a0f16ad2d44c39c5b824876fdf0951..a1e43e2b05217a3345d048da05fbcfd5
         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 67a71b0d04cc3c8239dce26c7022b18a6ff3a58c..76434e1b7307bdc3074847a99d780686f73c96a9 100644
+index a419308c2d71bf0e228aa7c591deb76c77eda894..1645c63f36c6d4bcd6e6ac474af8504848b1c077 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -340,6 +340,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -193,7 +193,7 @@ index 58422f00c7d64dbd1cf6d7211c9838875cbe7778..12efea4fd2a78f32a165941aff52edd0
             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 6b068863368e3f0c1102f35b87ffce3f77370fcb..9c118a5ebeb1fb473f8038b3cb4a157dc0084413 100644
+index 96726f06b83193fd7c5156efe6411b10eb1db435..7b39cb5346925c14f3f144d622ca7e5855420aa6 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -193,6 +193,13 @@ public abstract class Player extends LivingEntity {
@@ -266,7 +266,7 @@ index 09d2f1586d19d0d5c9c78cde5263f30e7a7d0647..fea8f974c5e35b0f5c515a4c7f033482
     // Purpur end
 }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 5b10feadf1ec5e7bbba4244b6347fdedd0f4b1d4..19e32a65f89ab2b4b44997028043e2b304209eff 100644
+index 687710a138edd8492e58aa026872851d00466508..d11442476371fefe6549654c97825a01d2cac61e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -173,6 +173,19 @@ public class PurpurConfig {
@@ -290,7 +290,7 @@ index 5b10feadf1ec5e7bbba4244b6347fdedd0f4b1d4..19e32a65f89ab2b4b44997028043e2b3
     public static boolean enderChestSixRows = false;
     public static boolean enderChestPermissionRows = false;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 3a44c1fff53590ae5c65404564a3a2ee12be62cf..e37db90448b0d1df6b40028ef6ebc80a51932180 100644
+index f004e4290c0711d2e04c05677981f31b463af9fe..aa2371a611ca83247d422cc79ea37a8d798fdd0f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -92,6 +92,24 @@ public class PurpurWorldConfig {
--- a/patches/server/0011-Bring-back-server-name.patch
+++ b/patches/server/0011-Bring-back-server-name.patch
--- a/patches/server/0012-Configurable-server-mod-name.patch
+++ b/patches/server/0012-Configurable-server-mod-name.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable server mod name


 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7fe5d22b4c9eac832646780d4b5326edaca2979e..c88da193507aa4b322586e38ed04caf834c6b481 100644
+index 1f08b8e81fd6dfa850ead13f2d45adb823a447ab..b8ea1f9aa3a486033b6f3d0d150aa21ab6130d53 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1681,7 +1681,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1682,7 +1682,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
 
     @DontObfuscate
     public String getServerModName() {
@@ -18,7 +18,7 @@ index 7fe5d22b4c9eac832646780d4b5326edaca2979e..c88da193507aa4b322586e38ed04caf8
 
     public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 19e32a65f89ab2b4b44997028043e2b304209eff..09b250a987ae329efc0525d62e3fa27d867929b9 100644
+index d11442476371fefe6549654c97825a01d2cac61e..c4bdd22b7fd48c01bf3a136d7bd3a2b20a1e90a2 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -186,6 +186,11 @@ public class PurpurConfig {
--- a/patches/server/0013-LivingEntity-safeFallDistance.patch
+++ b/patches/server/0013-LivingEntity-safeFallDistance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity safeFallDistance


 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 91309d12ae4a1157d507062b27147cdcc4053658..428678c4341c0bde812113229f5eb91be3da2345 100644
+index 9d9cb6e697c4f09badc3ca121f2ef987900d65a8..bf3a3bd00260ba04c592c4313cde33e5d393d392 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -255,6 +255,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -16,7 +16,7 @@ index 91309d12ae4a1157d507062b27147cdcc4053658..428678c4341c0bde812113229f5eb91b
     public boolean forceDrops;
     public ArrayList<org.bukkit.inventory.ItemStack> drops = new ArrayList<org.bukkit.inventory.ItemStack>();
     public final org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes;
-@@ -354,7 +355,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -355,7 +356,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
             this.tryAddSoulSpeed();
         }
 
@@ -25,7 +25,7 @@ index 91309d12ae4a1157d507062b27147cdcc4053658..428678c4341c0bde812113229f5eb91b
             double d1 = this.getX();
             double d2 = this.getY();
             double d3 = this.getZ();
-@@ -369,7 +370,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -370,7 +371,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                 d3 = (double) landedPosition.getZ() + 0.5D + d5 / d6 * 0.5D;
             }
 
@@ -34,7 +34,7 @@ index 91309d12ae4a1157d507062b27147cdcc4053658..428678c4341c0bde812113229f5eb91b
             double d7 = Math.min((double) (0.2F + f / 15.0F), 2.5D);
             int i = (int) (150.0D * d7);
 
-@@ -2038,7 +2039,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2039,7 +2040,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
             MobEffectInstance mobeffect = this.getEffect(MobEffects.JUMP);
             float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);
 
@@ -44,10 +44,10 @@ index 91309d12ae4a1157d507062b27147cdcc4053658..428678c4341c0bde812113229f5eb91b
     }
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-index 7827187afa738776908d1c2151556af95affcbe8..55ced31c3e8118b11a6201a7d8a2779244b4c9b1 100644
+index 05405f22fa9001560eb3a6701f3bb0179a584fae..8bf1105601f000142246554d177965d1dc6a3339 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-@@ -370,7 +370,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
+@@ -381,7 +381,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
 
     @Override
     protected int calculateFallDamage(float fallDistance, float damageMultiplier) {
@@ -57,7 +57,7 @@ index 7827187afa738776908d1c2151556af95affcbe8..55ced31c3e8118b11a6201a7d8a27792
 
     protected int getInventorySize() {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Giant.java b/src/main/java/net/minecraft/world/entity/monster/Giant.java
-index 4a38296843048d3fff255370f980d81d0808bbef..4511b56c6f58336920f1470400f8e120f12f72e6 100644
+index e7e85c830d2a4804c625884010c5fec33008b014..8919464efeea5c1f6d10c88d77c4cf52af2b4a91 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Giant.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Giant.java
@@ -12,6 +12,7 @@ import net.minecraft.world.level.LevelReader;
--- a/patches/server/0014-Lagging-threshold.patch
+++ b/patches/server/0014-Lagging-threshold.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold


 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c88da193507aa4b322586e38ed04caf834c6b481..1c9c9260c442f3173d60b3ed564d8c3eee862628 100644
+index b8ea1f9aa3a486033b6f3d0d150aa21ab6130d53..75d15b7c157fea129a730a0f48ae9ea71f13d533 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -309,6 +309,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -40,7 +40,7 @@ index 7df709528c8c1d743d0ce1711a7acde4b5c4abb8..447cf06cb98d7b1d8399a2bfa76c580e
     // Purpur end
 }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 09b250a987ae329efc0525d62e3fa27d867929b9..f0dfed4573f1cac8aa9148fbddf9e8c601c21bdf 100644
+index c4bdd22b7fd48c01bf3a136d7bd3a2b20a1e90a2..ebbb60f0ea50b4bfb2eebd3c45efbcce1e986882 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 {
--- a/patches/server/0015-PlayerSetSpawnerTypeWithEggEvent.patch
+++ b/patches/server/0015-PlayerSetSpawnerTypeWithEggEvent.patch
--- a/patches/server/0016-Player-invulnerabilities.patch
+++ b/patches/server/0016-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 a1e43e2b05217a3345d048da05fbcfd506522809..7dc8d5a86eeae7e291a6295a23a062903c77d37d 100644
+index 3b6af7b76db3d550eb7f199f9e8afd1c0af97e2e..206e8d9f7f04b4097402fa66390e7051af7df61e 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -278,6 +278,7 @@ public class ServerPlayer extends Player {
@@ -24,7 +24,7 @@ index a1e43e2b05217a3345d048da05fbcfd506522809..7dc8d5a86eeae7e291a6295a23a06290
     }
 
     // Yes, this doesn't match Vanilla, but it's the best we can do for now.
-@@ -1090,6 +1092,12 @@ public class ServerPlayer extends Player {
+@@ -1099,6 +1101,12 @@ public class ServerPlayer extends Player {
 
     }
 
@@ -37,7 +37,7 @@ index a1e43e2b05217a3345d048da05fbcfd506522809..7dc8d5a86eeae7e291a6295a23a06290
     @Override
     public boolean hurt(DamageSource source, float amount) {
         if (this.isInvulnerableTo(source)) {
-@@ -1097,7 +1105,7 @@ public class ServerPlayer extends Player {
+@@ -1106,7 +1114,7 @@ public class ServerPlayer extends Player {
         } else {
             boolean flag = this.server.isDedicatedServer() && this.isPvpAllowed() && source.is(DamageTypeTags.IS_FALL);
 
@@ -46,7 +46,7 @@ index a1e43e2b05217a3345d048da05fbcfd506522809..7dc8d5a86eeae7e291a6295a23a06290
                 return false;
             } else {
                 Entity entity = source.getEntity();
-@@ -1276,6 +1284,7 @@ public class ServerPlayer extends Player {
+@@ -1285,6 +1293,7 @@ public class ServerPlayer extends Player {
             }
             // Paper end
 
@@ -54,7 +54,7 @@ index a1e43e2b05217a3345d048da05fbcfd506522809..7dc8d5a86eeae7e291a6295a23a06290
             return this;
         }
     }
-@@ -2093,6 +2102,7 @@ public class ServerPlayer extends Player {
+@@ -2102,6 +2111,7 @@ public class ServerPlayer extends Player {
     }
 
     public void sendTexturePack(String url, String hash, boolean required, @Nullable Component resourcePackPrompt) {
@@ -62,7 +62,7 @@ index a1e43e2b05217a3345d048da05fbcfd506522809..7dc8d5a86eeae7e291a6295a23a06290
         this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt));
     }
 
-@@ -2680,9 +2690,17 @@ public class ServerPlayer extends Player {
+@@ -2689,9 +2699,17 @@ public class ServerPlayer extends Player {
 
     @Override
     public boolean isImmobile() {
@@ -82,7 +82,7 @@ index a1e43e2b05217a3345d048da05fbcfd506522809..7dc8d5a86eeae7e291a6295a23a06290
     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 76434e1b7307bdc3074847a99d780686f73c96a9..1782c461c5d5cc1a2416deb58c8345f16984ddbb 100644
+index 1645c63f36c6d4bcd6e6ac474af8504848b1c077..585a712467ee29c32ef8e59cc800f2a5bfae1db6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2088,12 +2088,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -108,7 +108,7 @@ index 76434e1b7307bdc3074847a99d780686f73c96a9..1782c461c5d5cc1a2416deb58c8345f1
         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 394427f591eb6e1f98bac92d6bfebea641da8154..d90c2b0f304c4900b3308903702c0ef489b9f511 100644
+index e73f0615ab8320da2a993d7dae0601d8e1536c58..b17b953d089e84026707f4ddc28b9b9718099d2a 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -976,6 +976,8 @@ public abstract class PlayerList {
@@ -146,7 +146,7 @@ index fea8f974c5e35b0f5c515a4c7f033482e54979c6..cf82afb7949a0031c1b656149e583c40
     // Purpur end
 }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index e37db90448b0d1df6b40028ef6ebc80a51932180..1e5290c9ef98f5ce2cca85e876fe8103b0368a02 100644
+index aa2371a611ca83247d422cc79ea37a8d798fdd0f..b2b286de570ba7c80c40ff5d9ac4b2602054b523 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -97,6 +97,8 @@ public class PurpurWorldConfig {
--- a/patches/server/0017-Anvil-API.patch
+++ b/patches/server/0017-Anvil-API.patch
--- a/patches/server/0018-Alternative-Keepalive-Handling.patch
+++ b/patches/server/0018-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 1782c461c5d5cc1a2416deb58c8345f16984ddbb..7d61ad24a1e8654ee0a0988b59c3f4b4598b306d 100644
+index 585a712467ee29c32ef8e59cc800f2a5bfae1db6..6ad34d0de6c5637f8c11c77ea8baee5ba040ff40 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -263,6 +263,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -38,7 +38,7 @@ index 1782c461c5d5cc1a2416deb58c8345f16984ddbb..7d61ad24a1e8654ee0a0988b59c3f4b4
         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
-@@ -3484,6 +3500,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3486,6 +3502,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
 
     @Override
     public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
@@ -56,7 +56,7 @@ index 1782c461c5d5cc1a2416deb58c8345f16984ddbb..7d61ad24a1e8654ee0a0988b59c3f4b4
         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 f0dfed4573f1cac8aa9148fbddf9e8c601c21bdf..dba0de7594851560706afaeb5e56f8c5574da303 100644
+index ebbb60f0ea50b4bfb2eebd3c45efbcce1e986882..2e210ec03710180a7a4af0a3180b6ced7d4744b7 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -196,6 +196,11 @@ public class PurpurConfig {
--- a/patches/server/0019-Silk-touch-spawners.patch
+++ b/patches/server/0019-Silk-touch-spawners.patch
@@ -89,7 +89,7 @@ index 936d844a5a246138c9f9ae4ae6e318242b8f1420..d58dc4aa02fe371deaf879df8692dbe9
             int i = 15 + worldserver.random.nextInt(15) + worldserver.random.nextInt(15);
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 1e5290c9ef98f5ce2cca85e876fe8103b0368a02..47f686b066da17d207052904ecf0bb172243b9b2 100644
+index b2b286de570ba7c80c40ff5d9ac4b2602054b523..10dd93d628605dc876f61fd798fb2ddaef94ba33 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -114,6 +114,38 @@ public class PurpurWorldConfig {
--- a/patches/server/0020-Add-turtle-egg-block-options.patch
+++ b/patches/server/0020-Add-turtle-egg-block-options.patch
@@ -36,7 +36,7 @@ index 6c1a0e6f961e46a1a89850746a71e97b32514adf..1942649e868fc985a488034c411a6721
     }
 }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 47f686b066da17d207052904ecf0bb172243b9b2..c8df1eca97b510559482d41b28569df0e9934b3d 100644
+index 10dd93d628605dc876f61fd798fb2ddaef94ba33..40354fc7dd9d0dc35c7e45b95b114713862e41fe 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -146,6 +146,15 @@ public class PurpurWorldConfig {
--- a/patches/server/0021-Logger-settings-suppressing-pointless-logs.patch
+++ b/patches/server/0021-Logger-settings-suppressing-pointless-logs.patch
@@ -53,14 +53,31 @@ index 110503062b3043cffa082a1cda6b8d57152869aa..3e7e06bd5e9e4ed45c9e3452eb04e946
         if (MinecraftServer.getServer() != null && MinecraftServer.getServer().isDebugging()) {
             new Exception().printStackTrace();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index dba0de7594851560706afaeb5e56f8c5574da303..c875d0351a32fa5bd75f4f440d6623830febf86b 100644
+index 2e210ec03710180a7a4af0a3180b6ced7d4744b7..9db231480f0763c2b6514a956ec9398b98b7d1bc 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -235,4 +235,15 @@ public class PurpurConfig {
-         org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
+@@ -173,12 +173,14 @@ public class PurpurConfig {
+         return builder.build();
+     }
+ 
+    public static String cannotRideMob = "<red>You cannot mount that mob";
+     public static String afkBroadcastAway = "<yellow><italic>%s is now AFK";
+     public static String afkBroadcastBack = "<yellow><italic>%s is no longer AFK";
+     public static boolean afkBroadcastUseDisplayName = false;
+     public static String afkTabListPrefix = "[AFK] ";
+     public static String afkTabListSuffix = "";
+     private static void messages() {
+        cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
+         afkBroadcastAway = getString("settings.messages.afk-broadcast-away", afkBroadcastAway);
+         afkBroadcastBack = getString("settings.messages.afk-broadcast-back", afkBroadcastBack);
+         afkBroadcastUseDisplayName = getBoolean("settings.messages.afk-broadcast-use-display-name", afkBroadcastUseDisplayName);
+@@ -236,8 +238,14 @@ public class PurpurConfig {
         enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
     }
-+
+ 
+-    public static String cannotRideMob = "<red>You cannot mount that mob";
+-    private static void messages() {
+-        cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
 +    public static boolean loggerSuppressInitLegacyMaterialError = false;
 +    public static boolean loggerSuppressIgnoredAdvancementWarnings = false;
 +    public static boolean loggerSuppressUnrecognizedRecipeErrors = false;
@@ -70,5 +87,5 @@ index dba0de7594851560706afaeb5e56f8c5574da303..c875d0351a32fa5bd75f4f440d662383
 +        loggerSuppressIgnoredAdvancementWarnings = getBoolean("settings.logger.suppress-ignored-advancement-warnings", loggerSuppressIgnoredAdvancementWarnings);
 +        loggerSuppressUnrecognizedRecipeErrors = getBoolean("settings.logger.suppress-unrecognized-recipe-errors", loggerSuppressUnrecognizedRecipeErrors);
 +        loggerSuppressSetBlockFarChunk = getBoolean("settings.logger.suppress-setblock-in-far-chunk-errors", loggerSuppressSetBlockFarChunk);
-+    }
+     }
 }
--- a/patches/server/0022-Disable-outdated-build-check.patch
+++ b/patches/server/0022-Disable-outdated-build-check.patch
--- a/patches/server/0023-Giants-AI-settings.patch
+++ b/patches/server/0023-Giants-AI-settings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Giants AI settings


 diff --git a/src/main/java/net/minecraft/world/entity/monster/Giant.java b/src/main/java/net/minecraft/world/entity/monster/Giant.java
-index 4511b56c6f58336920f1470400f8e120f12f72e6..3d45d1a5091fbf7dd275aebfca336d80a72010b0 100644
+index 8919464efeea5c1f6d10c88d77c4cf52af2b4a91..a73514ab24686f991c1a5bded0684393fffb2efd 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Giant.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Giant.java
@@ -1,13 +1,36 @@
@@ -45,9 +45,9 @@ index 4511b56c6f58336920f1470400f8e120f12f72e6..3d45d1a5091fbf7dd275aebfca336d80
 
 public class Giant extends Monster {
     public Giant(EntityType<? extends Giant> type, Level world) {
-@@ -22,6 +45,53 @@ public class Giant extends Monster {
-         this.getAttribute(Attributes.ATTACK_DAMAGE).setBaseValue(this.level.purpurConfig.giantAttackDamage);
+@@ -45,6 +68,53 @@ public class Giant extends Monster {
     }
+     // Purpur end
 
 +    @Override
 +    protected void registerGoals() {
@@ -99,7 +99,7 @@ index 4511b56c6f58336920f1470400f8e120f12f72e6..3d45d1a5091fbf7dd275aebfca336d80
     @Override
     protected float getStandingEyeHeight(Pose pose, EntityDimensions dimensions) {
         return 10.440001F;
-@@ -33,6 +103,6 @@ public class Giant extends Monster {
+@@ -56,6 +126,6 @@ public class Giant extends Monster {
 
     @Override
     public float getWalkTargetValue(BlockPos pos, LevelReader world) {
@@ -108,7 +108,7 @@ index 4511b56c6f58336920f1470400f8e120f12f72e6..3d45d1a5091fbf7dd275aebfca336d80
     }
 }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c8df1eca97b510559482d41b28569df0e9934b3d..71333fd7ea1cde870bb1d76959d1b599d8c6376d 100644
+index 40354fc7dd9d0dc35c7e45b95b114713862e41fe..4e3fc06a58722800b6257df15f2a577227660d66 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -400,6 +400,10 @@ public class PurpurWorldConfig {
--- a/patches/server/0024-Zombie-horse-naturally-spawn.patch
+++ b/patches/server/0024-Zombie-horse-naturally-spawn.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Zombie horse naturally spawn


 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 42d5b4ffc51da90a8f3bbec84e44ac2b0cb7b5ee..ac9f7e786d2e2042b8694a4ddd2f806758f9ea50 100644
+index 9168a02ede5b2fc924dbcf0063109f8e72d94d61..e2b1433034b1ab9bad821983515a37fd12ba4b37 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -873,10 +873,18 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -874,10 +874,18 @@ public class ServerLevel extends Level implements WorldGenLevel {
                 boolean flag1 = this.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.getEffectiveDifficulty() * this.paperConfig().entities.spawning.skeletonHorseThunderSpawnChance.or(0.01D) && !this.getBlockState(blockposition.below()).is(Blocks.LIGHTNING_ROD); // Paper
 
                 if (flag1) {
@@ -30,7 +30,7 @@ index 42d5b4ffc51da90a8f3bbec84e44ac2b0cb7b5ee..ac9f7e786d2e2042b8694a4ddd2f8067
                         entityhorseskeleton.setPos((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ());
                         this.addFreshEntity(entityhorseskeleton, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 71333fd7ea1cde870bb1d76959d1b599d8c6376d..9e0017fb69ea24c866fe78f0dc7cc90cfdb17517 100644
+index 4e3fc06a58722800b6257df15f2a577227660d66..d902600e12ecd976ffd5eb4ec572dcf54fd50b54 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1021,6 +1021,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0025-Charged-creeper-naturally-spawn.patch
+++ b/patches/server/0025-Charged-creeper-naturally-spawn.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Charged creeper naturally spawn


 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index d2d7ca4666d4cfd43dfcc8697e0957921bc48e61..9658611850a266ee1acf347d3f90cf4922a89d3c 100644
+index e208a743d161f53944cb5756041522658c3c9ce6..19c8fb5ab8c7818679919de07664df7dc8d54e91 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-@@ -178,6 +178,14 @@ public class Creeper extends Monster implements PowerableMob {
+@@ -255,6 +255,14 @@ public class Creeper extends Monster implements PowerableMob {
         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.creeperMaxHealth);
     }
 
@@ -24,7 +24,7 @@ index d2d7ca4666d4cfd43dfcc8697e0957921bc48e61..9658611850a266ee1acf347d3f90cf49
     protected SoundEvent getHurtSound(DamageSource source) {
         return SoundEvents.CREEPER_HURT;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 9e0017fb69ea24c866fe78f0dc7cc90cfdb17517..51ed3dd68cd723d9865207a6296016eddec71791 100644
+index d902600e12ecd976ffd5eb4ec572dcf54fd50b54..c06893ab41e84e898528b4d3efe043ccb42cf6c3 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -270,6 +270,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0026-Rabbit-naturally-spawn-toast-and-killer.patch
+++ b/patches/server/0026-Rabbit-naturally-spawn-toast-and-killer.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Rabbit naturally spawn toast and killer


 diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-index 1cb36eb937084c6dbc72d33e51c52af6f14c885d..1e8627f92580d791601fddb01f73b281797c06cb 100644
+index c43bb09caa560e9ea4596b5bb167e1273e599ed7..f7a1b15bd29e9c0848141da469acbfb67e8d8e4d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-@@ -410,10 +410,23 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
+@@ -472,10 +472,23 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
         }
 
         this.setVariant(entityrabbit_variant);
@@ -33,7 +33,7 @@ index 1cb36eb937084c6dbc72d33e51c52af6f14c885d..1e8627f92580d791601fddb01f73b281
         int i = world.getRandom().nextInt(100);
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 51ed3dd68cd723d9865207a6296016eddec71791..d402acc4bba74963809af86e5348405312781620 100644
+index c06893ab41e84e898528b4d3efe043ccb42cf6c3..9acbc0d0b54229d8d97ce3b0a4e8e93534f89b35 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -704,6 +704,8 @@ public class PurpurWorldConfig {
--- a/patches/server/0027-Fix-outdated-server-showing-in-ping-before-server-fu.patch
+++ b/patches/server/0027-Fix-outdated-server-showing-in-ping-before-server-fu.patch
--- a/patches/server/0028-Tulips-change-fox-type.patch
+++ b/patches/server/0028-Tulips-change-fox-type.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Tulips change fox type


 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index b75c942e212e6659723c4fea3f06f85a627096f0..5ee2f4d9e0bb97de9cb8bd3b2c4b6280c607b323 100644
+index b143032e87ecd74203e6486eea1248a3f6ce13f1..71fba6fd95f362916e93e89b626dad7c7a72da0b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
@@ -35,6 +35,7 @@ import net.minecraft.util.RandomSource;
@@ -24,7 +24,7 @@ index b75c942e212e6659723c4fea3f06f85a627096f0..5ee2f4d9e0bb97de9cb8bd3b2c4b6280
 import net.minecraft.world.level.pathfinder.BlockPathTypes;
 import net.minecraft.world.phys.Vec3;
 
-@@ -347,6 +349,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
+@@ -387,6 +389,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
     }
 
     private void setTargetGoals() {
@@ -36,7 +36,7 @@ index b75c942e212e6659723c4fea3f06f85a627096f0..5ee2f4d9e0bb97de9cb8bd3b2c4b6280
         if (this.getVariant() == Fox.Type.RED) {
             this.targetSelector.addGoal(4, this.landTargetGoal);
             this.targetSelector.addGoal(4, this.turtleEggTargetGoal);
-@@ -380,6 +387,7 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
+@@ -420,6 +427,7 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
 
     public void setVariant(Fox.Type variant) {
         this.entityData.set(Fox.DATA_TYPE_ID, variant.getId());
@@ -44,7 +44,7 @@ index b75c942e212e6659723c4fea3f06f85a627096f0..5ee2f4d9e0bb97de9cb8bd3b2c4b6280
     }
 
     List<UUID> getTrustedUUIDs() {
-@@ -716,6 +724,29 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
+@@ -756,6 +764,29 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
         return this.getTrustedUUIDs().contains(uuid);
     }
 
@@ -75,7 +75,7 @@ index b75c942e212e6659723c4fea3f06f85a627096f0..5ee2f4d9e0bb97de9cb8bd3b2c4b6280
     // Paper start - Cancellable death event
     protected org.bukkit.event.entity.EntityDeathEvent dropAllDeathLoot(DamageSource source) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index d402acc4bba74963809af86e5348405312781620..ebc2aa944fdd6bde9463450387a0dda7462debc5 100644
+index 9acbc0d0b54229d8d97ce3b0a4e8e93534f89b35..b60c5e84d13d7cd51d1203a35a9382c1ff6dec55 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -380,6 +380,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0029-Breedable-Polar-Bears.patch
+++ b/patches/server/0029-Breedable-Polar-Bears.patch
@@ -5,13 +5,34 @@ Subject: [PATCH] Breedable Polar Bears


 diff --git a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-index 71f75dd1d0c9b77f73138297a1be642c67c78c01..071236ec8534dfce2560ca14c09865fc053ab36a 100644
+index 3f185b02dc23942d2216cf9a8bdc493ffa2e75d9..05739e69f1a11138d7c13bb9d8ca7695753ae40c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-@@ -70,6 +70,27 @@ public class PolarBear extends Animal implements NeutralMob {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.polarBearMaxHealth);
+@@ -74,17 +74,17 @@ public class PolarBear extends Animal implements NeutralMob {
+     // Purpur start
+     @Override
+     public boolean isRidable() {
+-        return level.purpurConfig.polarBearRidable;
+        return level().purpurConfig.polarBearRidable;
     }
 
+     @Override
+     public boolean dismountsUnderwater() {
+-        return level.purpurConfig.useDismountsUnderwaterTag ? super.dismountsUnderwater() : !level.purpurConfig.polarBearRidableInWater;
+        return level().purpurConfig.useDismountsUnderwaterTag ? super.dismountsUnderwater() : !level().purpurConfig.polarBearRidableInWater;
+     }
+ 
+     @Override
+     public boolean isControllable() {
+-        return level.purpurConfig.polarBearControllable;
+        return level().purpurConfig.polarBearControllable;
+     }
+ 
+     @Override
+@@ -99,6 +99,27 @@ public class PolarBear extends Animal implements NeutralMob {
+     }
+     // Purpur end
+ 
 +    public boolean canMate(Animal other) {
 +        if (other == this) {
 +            return false;
@@ -36,7 +57,7 @@ index 71f75dd1d0c9b77f73138297a1be642c67c78c01..071236ec8534dfce2560ca14c09865fc
     @Nullable
     @Override
     public AgeableMob getBreedOffspring(ServerLevel world, AgeableMob entity) {
-@@ -78,7 +99,7 @@ public class PolarBear extends Animal implements NeutralMob {
+@@ -107,7 +128,7 @@ public class PolarBear extends Animal implements NeutralMob {
 
     @Override
     public boolean isFood(ItemStack stack) {
@@ -45,12 +66,12 @@ index 71f75dd1d0c9b77f73138297a1be642c67c78c01..071236ec8534dfce2560ca14c09865fc
     }
 
     @Override
-@@ -87,6 +108,12 @@ public class PolarBear extends Animal implements NeutralMob {
-         this.goalSelector.addGoal(0, new FloatGoal(this));
+@@ -117,6 +138,12 @@ public class PolarBear extends Animal implements NeutralMob {
+         this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
         this.goalSelector.addGoal(1, new PolarBear.PolarBearMeleeAttackGoal());
         this.goalSelector.addGoal(1, new PolarBear.PolarBearPanicGoal());
 +        // Purpur start
-+        if (level.purpurConfig.polarBearBreedableItem != null) {
+        if (level().purpurConfig.polarBearBreedableItem != null) {
 +            this.goalSelector.addGoal(2, new net.minecraft.world.entity.ai.goal.BreedGoal(this, 1.0D));
 +            this.goalSelector.addGoal(3, new net.minecraft.world.entity.ai.goal.TemptGoal(this, 1.0D, net.minecraft.world.item.crafting.Ingredient.of(level.purpurConfig.polarBearBreedableItem), false));
 +        }
@@ -59,7 +80,7 @@ index 71f75dd1d0c9b77f73138297a1be642c67c78c01..071236ec8534dfce2560ca14c09865fc
         this.goalSelector.addGoal(5, new RandomStrollGoal(this, 1.0D));
         this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 6.0F));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ebc2aa944fdd6bde9463450387a0dda7462debc5..4d4e44957d4a67aed358d4e2e3161fbab83d1f6c 100644
+index b60c5e84d13d7cd51d1203a35a9382c1ff6dec55..c9327c407d1fce1a80307eb3ad2c4c5c123fba8e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -686,6 +686,8 @@ public class PurpurWorldConfig {
--- a/patches/server/0030-Chickens-can-retaliate.patch
+++ b/patches/server/0030-Chickens-can-retaliate.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Chickens can retaliate


 diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-index c7ff22ee963e3d7ca3c5b819b38cca466c5d78c5..7d6307aed4d1c15edf2008715ec90f61aac42046 100644
+index cbaf7993adb03cdb61c8e0cb29a7362b63ae3914..bf281b45979e16551fe4777ff69fb9ef67d1f839 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-@@ -57,18 +57,29 @@ public class Chicken extends Animal {
+@@ -57,6 +57,9 @@ public class Chicken extends Animal {
     @Override
     public void initAttributes() {
         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.chickenMaxHealth);
@@ -17,9 +17,11 @@ index c7ff22ee963e3d7ca3c5b819b38cca466c5d78c5..7d6307aed4d1c15edf2008715ec90f61
 +        }
     }
 
-     @Override
+     // Purpur start
+@@ -80,13 +83,21 @@ public class Chicken extends Animal {
     protected void registerGoals() {
         this.goalSelector.addGoal(0, new FloatGoal(this));
+         this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
 -        this.goalSelector.addGoal(1, new PanicGoal(this, 1.4D));
 +        // this.goalSelector.addGoal(1, new PanicGoal(this, 1.4D)); // Purpur - moved down
         this.goalSelector.addGoal(2, new BreedGoal(this, 1.0D));
@@ -39,7 +41,7 @@ index c7ff22ee963e3d7ca3c5b819b38cca466c5d78c5..7d6307aed4d1c15edf2008715ec90f61
     }
 
     @Override
-@@ -77,7 +88,7 @@ public class Chicken extends Animal {
+@@ -95,7 +106,7 @@ public class Chicken extends Animal {
     }
 
     public static AttributeSupplier.Builder createAttributes() {
@@ -49,7 +51,7 @@ index c7ff22ee963e3d7ca3c5b819b38cca466c5d78c5..7d6307aed4d1c15edf2008715ec90f61
 
     @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 4d4e44957d4a67aed358d4e2e3161fbab83d1f6c..6d7ecc73de85f299f2ae315f58927431b399f3f2 100644
+index c9327c407d1fce1a80307eb3ad2c4c5c123fba8e..b8e799b15ab1e4559f3e1aece3d4efa5f1d717a1 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -240,6 +240,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0031-Add-option-to-set-armorstand-step-height.patch
+++ b/patches/server/0031-Add-option-to-set-armorstand-step-height.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to set armorstand step height


 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 05c3985cddae94e26fb70657c1add2f87bff8080..cd97c126dd4d15bdcd5f24792f67ce40b870dd2a 100644
+index 9b692140796eb5296a0478fd18d9b33278be6f5d..43d5b06a87909b544d151b238f7479c95c1ac1b2 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -321,7 +321,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -30,7 +30,7 @@ index 8a8b9e8983be1acad66ad875c901be5bbdeabb1f..316716b8827b974fa62f7f27d57c3b77
         if (!this.canTick) {
             if (this.noTickPoseDirty) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6d7ecc73de85f299f2ae315f58927431b399f3f2..9e332172eab872fa0b5c480ec723006d26713c8e 100644
+index b8e799b15ab1e4559f3e1aece3d4efa5f1d717a1..213b1be1cb2f22236bdb01575e2ee41eed562012 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -92,6 +92,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0032-Cat-spawning-options.patch
+++ b/patches/server/0032-Cat-spawning-options.patch
@@ -51,7 +51,7 @@ index 5f407535298a31a34cfe114dd863fd6a9b977707..29c7e33fe961020e5a0007287fe9b663
     }
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 9e332172eab872fa0b5c480ec723006d26713c8e..a3995aa84035771aad411d54bf2e41721f0f006d 100644
+index 213b1be1cb2f22236bdb01575e2ee41eed562012..aad4d95b24473a3bdcaa8120c39985b62adb7aa4 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -225,6 +225,9 @@ public class PurpurWorldConfig {
--- a/patches/server/0033-Cows-eat-mushrooms.patch
+++ b/patches/server/0033-Cows-eat-mushrooms.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cows eat mushrooms


 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-index 2f45444ad13e5ef3619788b19ec9c16be1f87950..2d8f51fd2f9562ccffe25a965aa02613eed3d71b 100644
+index 9a973e2dc94aa1c8928eea87a6a12789381d15d8..07d60d3f49a4ed67cc4739baddbb41818b557eb1 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
@@ -2,6 +2,7 @@ package net.minecraft.world.entity.animal;
@@ -24,15 +24,15 @@ index 2f45444ad13e5ef3619788b19ec9c16be1f87950..2d8f51fd2f9562ccffe25a965aa02613
 import net.minecraft.world.level.block.state.BlockState;
 // CraftBukkit start
 import org.bukkit.craftbukkit.event.CraftEventFactory;
-@@ -51,6 +53,7 @@ public class Cow extends Animal {
-         this.goalSelector.addGoal(0, new FloatGoal(this));
+@@ -69,6 +71,7 @@ public class Cow extends Animal {
+         this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
         this.goalSelector.addGoal(1, new PanicGoal(this, 2.0D));
         this.goalSelector.addGoal(2, new BreedGoal(this, 1.0D));
 +        if (level.purpurConfig.cowFeedMushrooms > 0) this.goalSelector.addGoal(3, new TemptGoal(this, 1.25D, Ingredient.of(Items.WHEAT, Blocks.RED_MUSHROOM.asItem(), Blocks.BROWN_MUSHROOM.asItem()), false)); else // Purpur
         this.goalSelector.addGoal(3, new TemptGoal(this, 1.25D, Ingredient.of(Items.WHEAT), false));
         this.goalSelector.addGoal(4, new FollowParentGoal(this, 1.25D));
         this.goalSelector.addGoal(5, new WaterAvoidingRandomStrollGoal(this, 1.0D));
-@@ -105,6 +108,10 @@ public class Cow extends Animal {
+@@ -124,6 +127,10 @@ public class Cow extends Animal {
 
             player.setItemInHand(hand, itemstack1);
             return InteractionResult.sidedSuccess(this.level().isClientSide);
@@ -43,7 +43,7 @@ index 2f45444ad13e5ef3619788b19ec9c16be1f87950..2d8f51fd2f9562ccffe25a965aa02613
         } else {
             return super.mobInteract(player, hand);
         }
-@@ -120,4 +127,69 @@ public class Cow extends Animal {
+@@ -139,4 +146,69 @@ public class Cow extends Animal {
     protected float getStandingEyeHeight(Pose pose, EntityDimensions dimensions) {
         return this.isBaby() ? dimensions.height * 0.95F : 1.3F;
     }
@@ -114,7 +114,7 @@ index 2f45444ad13e5ef3619788b19ec9c16be1f87950..2d8f51fd2f9562ccffe25a965aa02613
 +    // Purpur end
 }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a3995aa84035771aad411d54bf2e41721f0f006d..c9a48e01a63ccefa152b5ae13a8b5f40337a69b5 100644
+index aad4d95b24473a3bdcaa8120c39985b62adb7aa4..b3f8077b7a27a0298d88a651cb93b4028f2621ee 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -273,6 +273,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0034-Fix-cow-rotation-when-shearing-mooshroom.patch
+++ b/patches/server/0034-Fix-cow-rotation-when-shearing-mooshroom.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix cow rotation when shearing mooshroom


 diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-index 9e5a1d8a406ad43d762f421a2589f649402b6f7d..841d97651827c24350854fa16f9c65e8daf70d55 100644
+index 2eac9d3c1069f79c3fcbfb87518b5d5d1e17c6dd..3e798a9d94963dc39ec4a81265fa659b6cfe5db8 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-@@ -185,7 +185,13 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
+@@ -202,7 +202,13 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
                 // this.discard(); // CraftBukkit - moved down
                 entitycow.moveTo(this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
                 entitycow.setHealth(this.getHealth());
--- a/patches/server/0035-Pigs-give-saddle-back.patch
+++ b/patches/server/0035-Pigs-give-saddle-back.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Pigs give saddle back


 diff --git a/src/main/java/net/minecraft/world/entity/animal/Pig.java b/src/main/java/net/minecraft/world/entity/animal/Pig.java
-index 29f11d780c0e56fe69c05d95cbab6004d0c35a86..978d4e1816e1f7fb55ae69e4cb272740e095f711 100644
+index 26fe9e59e2321932c5ef70631510967162c0d896..2bd72ba2112c7212f331e6ca2655f557eee241d9 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
-@@ -156,6 +156,17 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
+@@ -174,6 +174,17 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
     public InteractionResult mobInteract(Player player, InteractionHand hand) {
         boolean flag = this.isFood(player.getItemInHand(hand));
 
@@ -27,7 +27,7 @@ index 29f11d780c0e56fe69c05d95cbab6004d0c35a86..978d4e1816e1f7fb55ae69e4cb272740
             if (!this.level().isClientSide) {
                 player.startRiding(this);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c9a48e01a63ccefa152b5ae13a8b5f40337a69b5..37ac816a50cd01fe82bdbbd68560e52fc4ce289c 100644
+index b3f8077b7a27a0298d88a651cb93b4028f2621ee..6cea8e16efb059ce2bc477a141d8807c2ea202ba 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -661,6 +661,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0036-Snowman-drop-and-put-back-pumpkin.patch
+++ b/patches/server/0036-Snowman-drop-and-put-back-pumpkin.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Snowman drop and put back pumpkin


 diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index 64919b11f1b73f63a44e5f395687704e50e76c9a..02e0f6d86a7dfc7a21a45bc8f50fed22a81207f2 100644
+index f95a472f3696061d5c1b0ac3bf281ae099871084..d4d843ee7fe52a97dc1dd063c7437f6a6b05b9de 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-@@ -171,6 +171,14 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
+@@ -191,6 +191,14 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
             }
 
             return InteractionResult.sidedSuccess(this.level().isClientSide);
@@ -21,9 +21,9 @@ index 64919b11f1b73f63a44e5f395687704e50e76c9a..02e0f6d86a7dfc7a21a45bc8f50fed22
 +            return InteractionResult.SUCCESS;
 +        // Purpur end
         } else {
-             return InteractionResult.PASS;
+             return tryRide(player, hand); // Purpur
         }
-@@ -182,6 +190,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
+@@ -202,6 +210,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
         if (!this.level().isClientSide()) {
             this.setPumpkin(false);
             this.forceDrops = true; // CraftBukkit
@@ -32,7 +32,7 @@ index 64919b11f1b73f63a44e5f395687704e50e76c9a..02e0f6d86a7dfc7a21a45bc8f50fed22
             this.forceDrops = false; // CraftBukkit
         }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 37ac816a50cd01fe82bdbbd68560e52fc4ce289c..02a83ac747afb715aac91e7e8145190331fd8495 100644
+index 6cea8e16efb059ce2bc477a141d8807c2ea202ba..7aae3881ff9896ea5f300e0428fad0f0b4735a12 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -840,6 +840,8 @@ public class PurpurWorldConfig {
--- a/patches/server/0037-Ender-dragon-always-drop-full-exp.patch
+++ b/patches/server/0037-Ender-dragon-always-drop-full-exp.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Ender dragon always drop full exp


 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 7f874dc782a9e781c23ec926e3a0f43eba22f47b..b3b3572a6e3a1334b193f8e1462387e0b7526828 100644
+index 39cf0189b9e82e700049e144db9150b9783cfba6..587a6cd7bd4cb724a778f98677eb09b0eb494349 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-@@ -672,7 +672,7 @@ public class EnderDragon extends Mob implements Enemy {
+@@ -747,7 +747,7 @@ public class EnderDragon extends Mob implements Enemy {
         boolean flag = this.level().getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT);
         short short0 = 500;
 
@@ -18,7 +18,7 @@ index 7f874dc782a9e781c23ec926e3a0f43eba22f47b..b3b3572a6e3a1334b193f8e1462387e0
         }
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 02a83ac747afb715aac91e7e8145190331fd8495..2d5133dcbd3187224c4845c33c647ce23392556f 100644
+index 7aae3881ff9896ea5f300e0428fad0f0b4735a12..b11ff20bc282fbc114a699bff47ba2ff7eb757c7 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -351,6 +351,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0038-Allow-soil-to-moisten-from-water-directly-under-it.patch
+++ b/patches/server/0038-Allow-soil-to-moisten-from-water-directly-under-it.patch
@@ -18,7 +18,7 @@ index 552d8c8f3f56bfccd25d11488ed7ec1644a92f47..d446b440e2bc5b73362fc3d30a10d2e5
 
     @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 2d5133dcbd3187224c4845c33c647ce23392556f..ea8a4f38be9d7eed401f053c14003ef1ed9a52ae 100644
+index b11ff20bc282fbc114a699bff47ba2ff7eb757c7..e7a8f166c202b76f89b6f9bbf0ce3de19c9c171e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -151,6 +151,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0039-Minecart-settings-and-WASD-controls.patch
+++ b/patches/server/0039-Minecart-settings-and-WASD-controls.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Minecart settings and WASD controls


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 7dc8d5a86eeae7e291a6295a23a062903c77d37d..a6117d497bcf36e88d947e0aebb22ea9972b3fbb 100644
+index 206e8d9f7f04b4097402fa66390e7051af7df61e..b0eab4e73c85e4c18301978daac91a4b862617b0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1103,6 +1103,7 @@ public class ServerPlayer extends Player {
+@@ -1112,6 +1112,7 @@ public class ServerPlayer extends Player {
         if (this.isInvulnerableTo(source)) {
             return false;
         } else {
@@ -148,7 +148,7 @@ index de4c1e4701236e7d5ec77339c51ad6a9d8288bb6..5ac102afde62c08f36886b466010ccfe
     protected ResourceLocation drops;
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ea8a4f38be9d7eed401f053c14003ef1ed9a52ae..dadd4d888c5202a5a95a712b4d5fd406bf8c0d7d 100644
+index e7a8f166c202b76f89b6f9bbf0ce3de19c9c171e..dc0041c9edd87032937b3f0e4850e3c9a09362a4 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -97,6 +97,68 @@ public class PurpurWorldConfig {
--- a/patches/server/0040-Disable-loot-drops-on-death-by-cramming.patch
+++ b/patches/server/0040-Disable-loot-drops-on-death-by-cramming.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Disable loot drops on death by cramming


 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 428678c4341c0bde812113229f5eb91be3da2345..ac0f725634029c12bd236df4bfcc857b5226f96c 100644
+index bf3a3bd00260ba04c592c4313cde33e5d393d392..a97f8fe12e2d4390fa3811335ffa3e3c9ef4aec6 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1799,6 +1799,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1800,6 +1800,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
 
         this.dropEquipment(); // CraftBukkit - from below
         if (this.shouldDropLoot() && this.level().getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) {
@@ -16,7 +16,7 @@ index 428678c4341c0bde812113229f5eb91be3da2345..ac0f725634029c12bd236df4bfcc857b
             this.dropFromLootTable(source, flag);
             // Paper start
             final boolean prev = this.clearEquipmentSlots;
-@@ -1807,6 +1808,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1808,6 +1809,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
             // Paper end
             this.dropCustomDeathLoot(source, i, flag);
             this.clearEquipmentSlots = prev; // Paper
@@ -25,7 +25,7 @@ index 428678c4341c0bde812113229f5eb91be3da2345..ac0f725634029c12bd236df4bfcc857b
         // CraftBukkit start - Call death event // Paper start - call advancement triggers with correct entity equipment
         org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops, () -> {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index dadd4d888c5202a5a95a712b4d5fd406bf8c0d7d..00dcdad8775519b8bc2d184902a5a2b66e2eaaa4 100644
+index dc0041c9edd87032937b3f0e4850e3c9a09362a4..c173ec973eecc8c79a75da3de349404ee455fb0f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -97,6 +97,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0041-Option-to-toggle-milk-curing-bad-omen.patch
+++ b/patches/server/0041-Option-to-toggle-milk-curing-bad-omen.patch
@@ -28,7 +28,7 @@ index f33977d95b6db473be4f95075ba99caf90ad0220..56dc04d8875971ee9a5d077a695509af
 
         return stack.isEmpty() ? new ItemStack(Items.BUCKET) : stack;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 00dcdad8775519b8bc2d184902a5a2b66e2eaaa4..6e29f232f602e939f30e35a575749d23160e61ae 100644
+index c173ec973eecc8c79a75da3de349404ee455fb0f..fbc7685ad34c67180a54e967a48355db349d46e8 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -98,8 +98,10 @@ public class PurpurWorldConfig {
--- a/patches/server/0042-End-gateway-should-check-if-entity-can-use-portal.patch
+++ b/patches/server/0042-End-gateway-should-check-if-entity-can-use-portal.patch
--- a/patches/server/0043-Skip-events-if-there-s-no-listeners.patch
+++ b/patches/server/0043-Skip-events-if-there-s-no-listeners.patch
--- a/patches/server/0044-Add-permission-for-F3-N-debug.patch
+++ b/patches/server/0044-Add-permission-for-F3-N-debug.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add permission for F3+N debug


 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index d90c2b0f304c4900b3308903702c0ef489b9f511..32a693c323f812bce2f9d0df57b3357333bb8fab 100644
+index b17b953d089e84026707f4ddc28b9b9718099d2a..bacce71fe2616068d45bee9cf12a1a3b3326b98e 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1155,6 +1155,7 @@ public abstract class PlayerList {
--- a/patches/server/0045-Configurable-TPS-Catchup.patch
+++ b/patches/server/0045-Configurable-TPS-Catchup.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable TPS Catchup


 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1c9c9260c442f3173d60b3ed564d8c3eee862628..baff72c3f9ec458dbdc179d0869b29e34bd7a755 100644
+index 75d15b7c157fea129a730a0f48ae9ea71f13d533..d9f3613381cf7166e0b504a4370420e1d0fadc4e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1175,7 +1175,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -24,10 +24,10 @@ index 1c9c9260c442f3173d60b3ed564d8c3eee862628..baff72c3f9ec458dbdc179d0869b29e3
                 this.profiler.pop();
                 this.endMetricsRecordingTick();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index c875d0351a32fa5bd75f4f440d6623830febf86b..8c2bbafaef3469b90efa966a5eb1af3fada2a812 100644
+index 9db231480f0763c2b6514a956ec9398b98b7d1bc..4905358e2a1939bfba963bda3fcf914721dfac45 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -246,4 +246,9 @@ public class PurpurConfig {
+@@ -248,4 +248,9 @@ public class PurpurConfig {
         loggerSuppressUnrecognizedRecipeErrors = getBoolean("settings.logger.suppress-unrecognized-recipe-errors", loggerSuppressUnrecognizedRecipeErrors);
         loggerSuppressSetBlockFarChunk = getBoolean("settings.logger.suppress-setblock-in-far-chunk-errors", loggerSuppressSetBlockFarChunk);
     }
--- a/patches/server/0046-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
+++ b/patches/server/0046-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
@@ -18,7 +18,7 @@ index 454dd67920826b8b62c2654abfd43fc08c2648e4..94d84f1d4232d1f4e866a7b991024301
                 if (!this.level().isClientSide && this.pickup == AbstractArrow.Pickup.ALLOWED) {
                     this.spawnAtLocation(this.getPickupItem(), 0.1F);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6e29f232f602e939f30e35a575749d23160e61ae..a08a38dabc08f88cea0411540236128b18ff47fa 100644
+index fbc7685ad34c67180a54e967a48355db349d46e8..40c1c5f0d15391e67ad0aa9bb6529d3659f43f18 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -99,9 +99,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0047-Add-enderman-and-creeper-griefing-controls.patch
+++ b/patches/server/0047-Add-enderman-and-creeper-griefing-controls.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add enderman and creeper griefing controls


 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 9658611850a266ee1acf347d3f90cf4922a89d3c..7e3b64dbd6df0b4d3556f7666c632a630a3a381e 100644
+index 19c8fb5ab8c7818679919de07664df7dc8d54e91..69b91852f2d4ffce14e6bd6f94902da61990717a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-@@ -284,7 +284,7 @@ public class Creeper extends Monster implements PowerableMob {
+@@ -361,7 +361,7 @@ public class Creeper extends Monster implements PowerableMob {
             this.level().getCraftServer().getPluginManager().callEvent(event);
             if (!event.isCancelled()) {
                 this.dead = true;
@@ -18,10 +18,10 @@ index 9658611850a266ee1acf347d3f90cf4922a89d3c..7e3b64dbd6df0b4d3556f7666c632a63
                 this.spawnLingeringCloud();
             } else {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 81b3f96b1fe8d592cac95e2deff8395edb6d589c..7eefdbe71588dbfcfb47bbb944e051f893bf790c 100644
+index 50925ae443a52833d34304dec30be899dbdaee14..945abc20319819cca2631876cb0abca07f7a730a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -510,6 +510,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -530,6 +530,7 @@ public class EnderMan extends Monster implements NeutralMob {
 
         @Override
         public boolean canUse() {
@@ -29,7 +29,7 @@ index 81b3f96b1fe8d592cac95e2deff8395edb6d589c..7eefdbe71588dbfcfb47bbb944e051f8
             return this.enderman.getCarriedBlock() == null ? false : (!this.enderman.level().getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING) ? false : this.enderman.getRandom().nextInt(reducedTickDelay(2000)) == 0);
         }
 
-@@ -557,6 +558,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -577,6 +578,7 @@ public class EnderMan extends Monster implements NeutralMob {
 
         @Override
         public boolean canUse() {
@@ -38,7 +38,7 @@ index 81b3f96b1fe8d592cac95e2deff8395edb6d589c..7eefdbe71588dbfcfb47bbb944e051f8
         }
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a08a38dabc08f88cea0411540236128b18ff47fa..d725ea8aa559120f3b0841296cae8643475e0046 100644
+index 40c1c5f0d15391e67ad0aa9bb6529d3659f43f18..a041fe8d6b728fc5d2811bb4ebd7454bb9dc73c6 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -362,6 +362,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0048-Villagers-follow-emerald-blocks.patch
+++ b/patches/server/0048-Villagers-follow-emerald-blocks.patch
@@ -30,7 +30,7 @@ index 564908ce0a560c2190fb624e77d227d3b7031024..f2a4e214744227f1df32e3782e71f8a9
     // CraftBukkit start
     private CraftMerchant craftMerchant;
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 423d0eb98c144d98622884212235b33213aaac6e..8c24cb27cc54852eacb144d189e7edab5b44b56f 100644
+index dc8225eb864b0fead5990762669dc219e6e8c526..ba326c8e633a2b583f40e1e1d891c26542d84324 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -152,6 +152,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -42,10 +42,10 @@ index 423d0eb98c144d98622884212235b33213aaac6e..8c24cb27cc54852eacb144d189e7edab
 
     @Override
 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 5df4c2468ff809b805d4f16021e7ffd2c1c2dd33..8623192215e428fede1c6bc57001e444b5476db3 100644
+index bb8d422f8c2ac80457970f300390b797e8807dd8..fd77ea367ff9a8ec6d6c45be9bdd1fb0f4154c9e 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -91,6 +91,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
+@@ -108,6 +108,7 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
         this.goalSelector.addGoal(1, new PanicGoal(this, 0.5D));
         this.goalSelector.addGoal(1, new LookAtTradingPlayerGoal(this));
         this.goalSelector.addGoal(2, new WanderingTrader.WanderToPositionGoal(this, 2.0D, 0.35D));
@@ -54,7 +54,7 @@ index 5df4c2468ff809b805d4f16021e7ffd2c1c2dd33..8623192215e428fede1c6bc57001e444
         this.goalSelector.addGoal(8, new WaterAvoidingRandomStrollGoal(this, 0.35D));
         this.goalSelector.addGoal(9, new InteractGoal(this, Player.class, 3.0F, 1.0F));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index d725ea8aa559120f3b0841296cae8643475e0046..1f493fc2e01277da33c6a79ff7d1395e37cc5ebf 100644
+index a041fe8d6b728fc5d2811bb4ebd7454bb9dc73c6..d4d5a82c3dd448bb32c2b60f07e5ec289eff89dd 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1036,6 +1036,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0049-Allow-leashing-villagers.patch
+++ b/patches/server/0049-Allow-leashing-villagers.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow leashing villagers


 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index e2a25c29ec74147b3e66aa0b3deb85a8f6ee53a5..e62de6ba4836da2c2a389c753ac0865f9b0184a6 100644
+index d8fc6216067cd03e10ec0bb5c13abc85215ac822..c68952d8f565ca14855fb43d9f8ea40bab27764f 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1302,6 +1302,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -17,12 +17,12 @@ index e2a25c29ec74147b3e66aa0b3deb85a8f6ee53a5..e62de6ba4836da2c2a389c753ac0865f
             // Paper start - drop leash variable
             org.bukkit.event.player.PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(this, player, hand, !player.getAbilities().instabuild);
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 8c24cb27cc54852eacb144d189e7edab5b44b56f..d2fcf2121ff9765fed268b2984a865329d27a17a 100644
+index ba326c8e633a2b583f40e1e1d891c26542d84324..e258d5b83e5cb517b9fe2e2818391f0666cacd84 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -160,6 +160,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.villagerMaxHealth);
+@@ -182,6 +182,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
     }
+     // Purpur end
 
 +    @Override
 +    public boolean canBeLeashed(Player player) {
@@ -33,12 +33,12 @@ index 8c24cb27cc54852eacb144d189e7edab5b44b56f..d2fcf2121ff9765fed268b2984a86532
     public Brain<Villager> getBrain() {
         return (Brain<Villager>) super.getBrain(); // CraftBukkit - decompile error
 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 8623192215e428fede1c6bc57001e444b5476db3..5bf96ff879318ea1be45f89b8689b6739ed9ca5b 100644
+index fd77ea367ff9a8ec6d6c45be9bdd1fb0f4154c9e..4dc8ac6a3e26a619ff4f2d7b907f192766c8281a 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-@@ -71,6 +71,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
-         this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.wanderingTraderMaxHealth);
+@@ -88,6 +88,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
     }
+     // Purpur end
 
 +    @Override
 +    public boolean canBeLeashed(Player player) {
@@ -49,7 +49,7 @@ index 8623192215e428fede1c6bc57001e444b5476db3..5bf96ff879318ea1be45f89b8689b673
     protected void registerGoals() {
         this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 1f493fc2e01277da33c6a79ff7d1395e37cc5ebf..5874ad0a9d3d2e838c15b3cc3c1e8a9992fdfc54 100644
+index d4d5a82c3dd448bb32c2b60f07e5ec289eff89dd..c3f1c669c9fa4e8c2077e948b6de65ab9c4c6fe3 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1037,6 +1037,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0050-Implement-infinite-liquids.patch
+++ b/patches/server/0050-Implement-infinite-liquids.patch
@@ -67,7 +67,7 @@ index 82e85fbbd45244d02df90fa00c9046e7f51275a2..ec6c63075306f9e5389e83641d2c8a82
     @Override
     protected void beforeDestroyingBlock(LevelAccessor world, BlockPos pos, BlockState state,  BlockPos source) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 5874ad0a9d3d2e838c15b3cc3c1e8a9992fdfc54..88978de01b75526802436714f6a9493d2eb4b0d9 100644
+index c3f1c669c9fa4e8c2077e948b6de65ab9c4c6fe3..a759adea89cc44add6fe22c626e9978bda8f3bbe 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -227,6 +227,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0051-Make-lava-flow-speed-configurable.patch
+++ b/patches/server/0051-Make-lava-flow-speed-configurable.patch
@@ -18,7 +18,7 @@ index 3706ebc551413401b0e6a9a0b1c2e3257d1337c1..b77cdbd8a7395e8442081c6a2b14695d
 
     @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ff6bda851c5e7f7b5eba17d059fcda6e5a469db7..6ac57d55bffcf2cec8d8c0369a14919256df1dad 100644
+index a759adea89cc44add6fe22c626e9978bda8f3bbe..e92879a7e0458eeee9b8006bdc64228808cc9e08 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -228,8 +228,12 @@ public class PurpurWorldConfig {
--- a/patches/server/0052-Add-player-death-exp-control-options.patch
+++ b/patches/server/0052-Add-player-death-exp-control-options.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add player death exp control options


 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 9c118a5ebeb1fb473f8038b3cb4a157dc0084413..d37080e74a7ce5442e4290eecb6352019b30fdb3 100644
+index 7b39cb5346925c14f3f144d622ca7e5855420aa6..f67bd221a239d98151e055f444795dea28a07269 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -1985,9 +1985,19 @@ public abstract class Player extends LivingEntity {
+@@ -1998,9 +1998,19 @@ public abstract class Player extends LivingEntity {
     @Override
     public int getExperienceReward() {
         if (!this.level().getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY) && !this.isSpectator()) {
@@ -32,7 +32,7 @@ index 9c118a5ebeb1fb473f8038b3cb4a157dc0084413..d37080e74a7ce5442e4290eecb635201
             return 0;
         }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6ac57d55bffcf2cec8d8c0369a14919256df1dad..df98fd64b51dd0352f48b6c666e277d113ebdcf1 100644
+index e92879a7e0458eeee9b8006bdc64228808cc9e08..b0e70dd59fd488f4c094326aae2647e08a2ee758 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -175,6 +175,8 @@ public class PurpurWorldConfig {
--- a/patches/server/0053-Configurable-void-damage-height-and-damage.patch
+++ b/patches/server/0053-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 cd97c126dd4d15bdcd5f24792f67ce40b870dd2a..6a3ab6ad06b7ae33549cdfa52e717bbae1fe78ca 100644
+index 43d5b06a87909b544d151b238f7479c95c1ac1b2..f5ae3d265fa190af4d8205ffa45ce053fe0c7ddc 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -834,7 +834,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -18,10 +18,10 @@ index cd97c126dd4d15bdcd5f24792f67ce40b870dd2a..6a3ab6ad06b7ae33549cdfa52e717bba
             && (!(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 ac0f725634029c12bd236df4bfcc857b5226f96c..ea190b4a87daad0ac9dcd73fd4de7d24fa9d6a4a 100644
+index a97f8fe12e2d4390fa3811335ffa3e3c9ef4aec6..2ac30426faa256dbfac48c0accab53a9c72809b9 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -2480,7 +2480,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -2481,7 +2481,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
 
     @Override
     protected void onBelowWorld() {
@@ -31,7 +31,7 @@ index ac0f725634029c12bd236df4bfcc857b5226f96c..ea190b4a87daad0ac9dcd73fd4de7d24
 
     protected void updateSwingTime() {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index df98fd64b51dd0352f48b6c666e277d113ebdcf1..81c25f1498868d75107ec050fa95d02f2c0afea1 100644
+index b0e70dd59fd488f4c094326aae2647e08a2ee758..5b41745fdc55441d1b8ac89571d690ef506462bd 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -100,10 +100,14 @@ public class PurpurWorldConfig {
--- a/patches/server/0054-Add-canSaveToDisk-to-Entity.patch
+++ b/patches/server/0054-Add-canSaveToDisk-to-Entity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add canSaveToDisk to Entity


 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6a3ab6ad06b7ae33549cdfa52e717bbae1fe78ca..b26e19f67767ef5d0da819be44f0ca0aabc2bdbb 100644
+index f5ae3d265fa190af4d8205ffa45ce053fe0c7ddc..cfef8dec1a96c97bd087ed6dc55eadae4feae079 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -473,6 +473,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -20,10 +20,10 @@ index 6a3ab6ad06b7ae33549cdfa52e717bbae1fe78ca..b26e19f67767ef5d0da819be44f0ca0a
         return this.hardCollides;
     }
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index cc51c88788e52c35447ff4c3dffaf8ac50474990..87a0d264d9b54e1b0b29f49431212c977864a30a 100644
+index 1fcf73cfe789bfe89c5ac01d4bd260e8d7dc0fc0..0ecbee51a48171cad95cc80bd26644774064fead 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -194,6 +194,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+@@ -314,6 +314,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
                     vec3d = vec3d.add(vec3d2.x * 0.3D - vec3d.x * 0.6D, 0.0D, vec3d2.z * 0.3D - vec3d.z * 0.6D);
                 }
             }
--- a/patches/server/0055-Dispenser-curse-of-binding-protection.patch
+++ b/patches/server/0055-Dispenser-curse-of-binding-protection.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Dispenser curse of binding protection


 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index e62de6ba4836da2c2a389c753ac0865f9b0184a6..fdd0acaaf69f9325feaf8167e8122191a0c7e9d7 100644
+index c68952d8f565ca14855fb43d9f8ea40bab27764f..1b18532360b9508a08ea46b48331acad3e37c049 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -65,6 +65,7 @@ import net.minecraft.world.item.ProjectileWeaponItem;
@@ -43,7 +43,7 @@ index d7a0cbde8f8c99276307502674c71463fbe7e89c..3500c56cb85d8c76b2acd77976d374ea
             // CraftBukkit start
             Level world = pointer.getLevel();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 81c25f1498868d75107ec050fa95d02f2c0afea1..c6856ca91aed12bab95c115e5f3bc6d01ef75594 100644
+index 5b41745fdc55441d1b8ac89571d690ef506462bd..4f46aa379b18f526c9826722b8d5fbf44cbf17d3 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -230,6 +230,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0056-Add-option-for-boats-to-eject-players-on-land.patch
+++ b/patches/server/0056-Add-option-for-boats-to-eject-players-on-land.patch
@@ -17,7 +17,7 @@ index 35aeba4e8430e6419caa9db4a0b931a994228618..5e33f19193ff49d0d2119d811d8f81d0
             } else {
                 return Boat.Status.IN_AIR;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c6856ca91aed12bab95c115e5f3bc6d01ef75594..93fd114bc45fe40eb19c5a7789bef1edd8f359e0 100644
+index 4f46aa379b18f526c9826722b8d5fbf44cbf17d3..f1d2f1a63ea62b4475f8c4a7f55f4c491b567022 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -97,12 +97,14 @@ public class PurpurWorldConfig {
--- a/patches/server/0057-Mending-mends-most-damages-equipment-first.patch
+++ b/patches/server/0057-Mending-mends-most-damages-equipment-first.patch
@@ -73,7 +73,7 @@ index ecf640b00007a386290f8dfe9935a8aa610079fd..2048899f8e4c8211e8dde0d11148d647
     public static Map.Entry<EquipmentSlot, ItemStack> getRandomItemWith(Enchantment enchantment, LivingEntity entity) {
         return getRandomItemWith(enchantment, entity, (stack) -> {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 93fd114bc45fe40eb19c5a7789bef1edd8f359e0..853284560fdb47e4861dfdb84bcd317801d028e3 100644
+index f1d2f1a63ea62b4475f8c4a7f55f4c491b567022..0552b09400749fd9a711d081e8940f8bba0bcc8d 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -97,6 +97,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0058-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0058-Add-5-second-tps-average-in-tps.patch
@@ -27,7 +27,7 @@ index fa56cd09102a89692b42f1d14257990508c5c720..f9251183df72ddc56662fd3f02acf216
         setListData(vector);
     }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index baff72c3f9ec458dbdc179d0869b29e34bd7a755..cd883e14611cdb5ab74861b669e64a6445d9de9c 100644
+index d9f3613381cf7166e0b504a4370420e1d0fadc4e..6e5bfabe11da547f28b1d56e5a279ae5d9bb3c54 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -305,7 +305,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
--- a/patches/server/0059-Implement-elytra-settings.patch
+++ b/patches/server/0059-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 ea190b4a87daad0ac9dcd73fd4de7d24fa9d6a4a..90ebbd8666a934fc3dce655a44cf4270a02d1bb1 100644
+index 2ac30426faa256dbfac48c0accab53a9c72809b9..7126ce61f58079d924bb86ff9257d75612bcc704 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3486,7 +3486,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3504,7 +3504,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
                     int j = i / 10;
 
                     if (j % 2 == 0) {
@@ -99,7 +99,7 @@ index 8078f127ff4b6e0aafb5804b9c02e237f79445b5..06c2f30b77a2c8aecc65e0c305f643d5
                         entityhuman.startAutoSpinAttack(20);
                         if (entityhuman.onGround()) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 853284560fdb47e4861dfdb84bcd317801d028e3..dba373f3acf4f4400dfe5f7f49ae7d3f4c654090 100644
+index 0552b09400749fd9a711d081e8940f8bba0bcc8d..d7cc6c9f15fdc29bbd1666d9a07904eea8a3d723 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -114,6 +114,19 @@ public class PurpurWorldConfig {
--- a/patches/server/0060-Item-entity-immunities.patch
+++ b/patches/server/0060-Item-entity-immunities.patch
@@ -115,7 +115,7 @@ index a925b5c490e7129b27370aa57b5fad1cf05530c6..09001578b88658c44d0661d340a0ee0f
 +    // Purpur end
 }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index dba373f3acf4f4400dfe5f7f49ae7d3f4c654090..31d259d0b914b344095dd0435891f55dd5ab4c56 100644
+index d7cc6c9f15fdc29bbd1666d9a07904eea8a3d723..ee354de33f436dde6a234c05787a9de28966d7cf 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -127,6 +127,49 @@ public class PurpurWorldConfig {
--- a/patches/server/0061-Add-ping-command.patch
+++ b/patches/server/0061-Add-ping-command.patch
@@ -17,17 +17,18 @@ index 147fcbdd784f06fe23138b20aef82f92ba154998..aadc9fc53b0f495664d90c40f30f9a12
 
         if (environment.includeIntegrated) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 8c2bbafaef3469b90efa966a5eb1af3fada2a812..ce2a7f193c9faa4578b2447348c5d29864f5d634 100644
+index 4905358e2a1939bfba963bda3fcf914721dfac45..a74932163207506e779c941c819eb663b98bd18c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -178,12 +178,14 @@ public class PurpurConfig {
+@@ -179,6 +179,7 @@ public class PurpurConfig {
     public static boolean afkBroadcastUseDisplayName = false;
     public static String afkTabListPrefix = "[AFK] ";
     public static String afkTabListSuffix = "";
 +    public static String pingCommandOutput = "<green>%s's ping is %sms";
     private static void messages() {
+         cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
         afkBroadcastAway = getString("settings.messages.afk-broadcast-away", afkBroadcastAway);
-         afkBroadcastBack = getString("settings.messages.afk-broadcast-back", afkBroadcastBack);
+@@ -186,6 +187,7 @@ public class PurpurConfig {
         afkBroadcastUseDisplayName = getBoolean("settings.messages.afk-broadcast-use-display-name", afkBroadcastUseDisplayName);
         afkTabListPrefix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix)));
         afkTabListSuffix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix)));
--- a/patches/server/0062-Add-demo-command.patch
+++ b/patches/server/0062-Add-demo-command.patch
@@ -17,18 +17,18 @@ index aadc9fc53b0f495664d90c40f30f9a128c3b4c95..54f9dd8d666b2b45190681f4362fce45
         }
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index ce2a7f193c9faa4578b2447348c5d29864f5d634..c78d76deb4b1c1a5bf3f2e7c4566f5cc6603dc52 100644
+index a74932163207506e779c941c819eb663b98bd18c..235db276a07017bf89e6311a0b84291e8a0af06b 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -178,6 +178,7 @@ public class PurpurConfig {
+@@ -179,6 +179,7 @@ public class PurpurConfig {
     public static boolean afkBroadcastUseDisplayName = false;
     public static String afkTabListPrefix = "[AFK] ";
     public static String afkTabListSuffix = "";
 +    public static String demoCommandOutput = "<green>%s has been shown the demo screen";
     public static String pingCommandOutput = "<green>%s's ping is %sms";
     private static void messages() {
-         afkBroadcastAway = getString("settings.messages.afk-broadcast-away", afkBroadcastAway);
-@@ -185,6 +186,7 @@ public class PurpurConfig {
+         cannotRideMob = getString("settings.messages.cannot-ride-mob", cannotRideMob);
+@@ -187,6 +188,7 @@ public class PurpurConfig {
         afkBroadcastUseDisplayName = getBoolean("settings.messages.afk-broadcast-use-display-name", afkBroadcastUseDisplayName);
         afkTabListPrefix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix)));
         afkTabListSuffix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix)));
--- a/patches/server/0063-Add-credits-command.patch
+++ b/patches/server/0063-Add-credits-command.patch
@@ -17,10 +17,10 @@ index 54f9dd8d666b2b45190681f4362fce457e8e8ef2..e5b1b6ad32c48a4ba13b4930954fad18
             org.purpurmc.purpur.command.PingCommand.register(this.dispatcher); // Purpur
         }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index c78d76deb4b1c1a5bf3f2e7c4566f5cc6603dc52..106b2abc4f7070ec4d1c6790f78c05392df43eff 100644
+index 235db276a07017bf89e6311a0b84291e8a0af06b..8e99128759e555cdef0efe9cea1b3b36f2c3fda9 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -178,6 +178,7 @@ public class PurpurConfig {
+@@ -179,6 +179,7 @@ public class PurpurConfig {
     public static boolean afkBroadcastUseDisplayName = false;
     public static String afkTabListPrefix = "[AFK] ";
     public static String afkTabListSuffix = "";
@@ -28,7 +28,7 @@ index c78d76deb4b1c1a5bf3f2e7c4566f5cc6603dc52..106b2abc4f7070ec4d1c6790f78c0539
     public static String demoCommandOutput = "<green>%s has been shown the demo screen";
     public static String pingCommandOutput = "<green>%s's ping is %sms";
     private static void messages() {
-@@ -186,6 +187,7 @@ public class PurpurConfig {
+@@ -188,6 +189,7 @@ public class PurpurConfig {
         afkBroadcastUseDisplayName = getBoolean("settings.messages.afk-broadcast-use-display-name", afkBroadcastUseDisplayName);
         afkTabListPrefix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-prefix", afkTabListPrefix)));
         afkTabListSuffix = MiniMessage.miniMessage().serialize(MiniMessage.miniMessage().deserialize(getString("settings.messages.afk-tab-list-suffix", afkTabListSuffix)));
--- a/patches/server/0064-Configurable-jockey-options.patch
+++ b/patches/server/0064-Configurable-jockey-options.patch
@@ -5,38 +5,38 @@ Subject: [PATCH] Configurable jockey options


 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 c379b5396de408724ccab41d2255a8ce8bcd892a..c5e3a361c5a31ae78156079f9e039ff8adb36151 100644
+index 8fcda30fd2ae9882d7101b24cff70e832db1eee0..a27a0de6858aa69caefc436aec3827b365d3d00c 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-@@ -78,6 +78,21 @@ public class Drowned extends Zombie implements RangedAttackMob {
-         this.getAttribute(Attributes.SPAWN_REINFORCEMENTS_CHANCE).setBaseValue(this.random.nextDouble() * this.level.purpurConfig.drownedSpawnReinforcements);
+@@ -95,6 +95,21 @@ public class Drowned extends Zombie implements RangedAttackMob {
     }
+     // Purpur end
 
 +    @Override
 +    public boolean jockeyOnlyBaby() {
-+        return level.purpurConfig.drownedJockeyOnlyBaby;
+        return level().purpurConfig.drownedJockeyOnlyBaby;
 +    }
 +
 +    @Override
 +    public double jockeyChance() {
-+        return level.purpurConfig.drownedJockeyChance;
+        return level().purpurConfig.drownedJockeyChance;
 +    }
 +
 +    @Override
 +    public boolean jockeyTryExistingChickens() {
-+        return level.purpurConfig.drownedJockeyTryExistingChickens;
+        return level().purpurConfig.drownedJockeyTryExistingChickens;
 +    }
 +
     @Override
     protected void addBehaviourGoals() {
         this.goalSelector.addGoal(1, new Drowned.DrownedGoToWaterGoal(this, 1.0D));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Husk.java b/src/main/java/net/minecraft/world/entity/monster/Husk.java
-index 9e84a90f42c4a526ef067b7aff457c9dcda571ef..d35c3630d7aba71271038cee04d97ca98038c847 100644
+index 83fba266721f17efb92f62cc61dbecf4024fb5d6..5e7c4c7a5962e638a2026a57803263830f11d35b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Husk.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Husk.java
-@@ -32,6 +32,21 @@ public class Husk extends Zombie {
-         this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.SPAWN_REINFORCEMENTS_CHANCE).setBaseValue(this.random.nextDouble() * this.level.purpurConfig.huskSpawnReinforcements);
+@@ -49,6 +49,21 @@ public class Husk extends Zombie {
     }
+     // Purpur end
 
 +    @Override
 +    public boolean jockeyOnlyBaby() {
@@ -57,10 +57,10 @@ index 9e84a90f42c4a526ef067b7aff457c9dcda571ef..d35c3630d7aba71271038cee04d97ca9
         return checkMonsterSpawnRules(type, world, spawnReason, pos, random) && (spawnReason == MobSpawnType.SPAWNER || world.canSeeSky(pos));
     }
 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 3263d467cbff5cd7382f9618c342314aafb2a004..6f20140adb276c0a08644cc3fb7d6b29982e8697 100644
+index a825c0e976a6bbddc5688bfe0010f8d653f27e08..a0439eac45376c132f6a1d7142c200e9c925130c 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -111,6 +111,18 @@ public class Zombie extends Monster {
+@@ -128,6 +128,18 @@ public class Zombie extends Monster {
         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.zombieMaxHealth);
     }
 
@@ -78,8 +78,8 @@ index 3263d467cbff5cd7382f9618c342314aafb2a004..6f20140adb276c0a08644cc3fb7d6b29
 +
     @Override
     protected void registerGoals() {
-         if (this.level().paperConfig().entities.behavior.zombiesTargetTurtleEggs) this.goalSelector.addGoal(4, new Zombie.ZombieAttackTurtleEggGoal(this, 1.0D, 3)); // Paper
-@@ -532,19 +544,20 @@ public class Zombie extends Monster {
+         this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
+@@ -551,19 +563,20 @@ public class Zombie extends Monster {
         if (object instanceof Zombie.ZombieGroupData) {
             Zombie.ZombieGroupData entityzombie_groupdatazombie = (Zombie.ZombieGroupData) object;
 
@@ -106,7 +106,7 @@ index 3263d467cbff5cd7382f9618c342314aafb2a004..6f20140adb276c0a08644cc3fb7d6b29
                         Chicken entitychicken1 = (Chicken) EntityType.CHICKEN.create(this.level());
 
                         if (entitychicken1 != null) {
-@@ -554,6 +567,7 @@ public class Zombie extends Monster {
+@@ -573,6 +586,7 @@ public class Zombie extends Monster {
                             this.startRiding(entitychicken1);
                             world.addFreshEntity(entitychicken1, CreatureSpawnEvent.SpawnReason.MOUNT); // CraftBukkit
                         }
@@ -115,12 +115,12 @@ index 3263d467cbff5cd7382f9618c342314aafb2a004..6f20140adb276c0a08644cc3fb7d6b29
                 }
             }
 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 7ca69d4ae42f982eef7c4470d6a28a3eb334401c..1f0265ee248da4dc1bf57a1d3d58aee52184fe72 100644
+index 0f42ae8062d2e3044accbc7fa296be9ae7ca7605..b0b39609a50ac0a7dade15651f5f33ff2b426e5a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-@@ -89,6 +89,21 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
-         this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.SPAWN_REINFORCEMENTS_CHANCE).setBaseValue(this.random.nextDouble() * this.level.purpurConfig.zombieVillagerSpawnReinforcements);
+@@ -106,6 +106,21 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
     }
+     // Purpur end
 
 +    @Override
 +    public boolean jockeyOnlyBaby() {
@@ -141,12 +141,12 @@ index 7ca69d4ae42f982eef7c4470d6a28a3eb334401c..1f0265ee248da4dc1bf57a1d3d58aee5
     protected void defineSynchedData() {
         super.defineSynchedData();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-index 5e97cec00a6ea97520f0e5acb6e30d5e7e5fab89..45c93c148cde236e01fe925c1a9b67e3e963bbb8 100644
+index 468923229dfda00eb704040461f8639bfa5082a7..0f53ab48bb28188400c7b420cd79ea202c8f5746 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-@@ -68,6 +68,21 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.zombifiedPiglinMaxHealth);
+@@ -85,6 +85,21 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
     }
+     // Purpur end
 
 +    @Override
 +    public boolean jockeyOnlyBaby() {
@@ -167,7 +167,7 @@ index 5e97cec00a6ea97520f0e5acb6e30d5e7e5fab89..45c93c148cde236e01fe925c1a9b67e3
     public void setPersistentAngerTarget(@Nullable UUID angryAt) {
         this.persistentAngerTarget = angryAt;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 2011a1e6ec9d52e6f97a2c311c39aa50e67c93a2..ec7bc641fa77a9fbb48aa0adf05dc119755dbe90 100644
+index ee354de33f436dde6a234c05787a9de28966d7cf..472514b9e6fcbb696ac89ac11b04a6ddc84cfb7c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -490,6 +490,9 @@ public class PurpurWorldConfig {
@@ -257,7 +257,7 @@ index 2011a1e6ec9d52e6f97a2c311c39aa50e67c93a2..ec7bc641fa77a9fbb48aa0adf05dc119
     private void zombifiedPiglinSettings() {
         if (PurpurConfig.version < 10) {
             double oldValue = getDouble("mobs.zombified_piglin.attributes.max-health", zombifiedPiglinMaxHealth);
-@@ -1266,5 +1293,8 @@ public class PurpurWorldConfig {
+@@ -1266,6 +1293,9 @@ public class PurpurWorldConfig {
         }
         zombifiedPiglinMaxHealth = getDouble("mobs.zombified_piglin.attributes.max_health", zombifiedPiglinMaxHealth);
         zombifiedPiglinSpawnReinforcements = getDouble("mobs.zombified_piglin.attributes.spawn_reinforcements", zombifiedPiglinSpawnReinforcements);
@@ -265,4 +265,5 @@ index 2011a1e6ec9d52e6f97a2c311c39aa50e67c93a2..ec7bc641fa77a9fbb48aa0adf05dc119
 +        zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance);
 +        zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);
     }
- }
+ 
+     public boolean babiesAreRidable = true;
--- a/patches/server/0065-Add-phantom-spawning-options.patch
+++ b/patches/server/0065-Add-phantom-spawning-options.patch
@@ -40,7 +40,7 @@ index bc7648dbc132551dc6591ab49a1919a623c30f60..5b880677c895d0e747a1ed6a380ae356
                                             for (int l = 0; l < k; ++l) {
                                                 // Paper start
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 1301d9498808d2edf98ca20de6886c8f50fbdb83..cfafb02e2ab909539b026419919382fc9d393e28 100644
+index 472514b9e6fcbb696ac89ac11b04a6ddc84cfb7c..fa7bafbba960f987f4dac7a12fd3014efa8eebdb 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -820,6 +820,12 @@ public class PurpurWorldConfig {
--- a/patches/server/0066-Implement-bed-explosion-options.patch
+++ b/patches/server/0066-Implement-bed-explosion-options.patch
@@ -27,7 +27,7 @@ index d40500f9a807cab0b2fb6fa9032f33f4fb74c895..e8405a57fb88e63b63baaf00645c4176
             }
         }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index cfafb02e2ab909539b026419919382fc9d393e28..903c17260729b61ec0e4ad5d2fbe6aea7a18a64a 100644
+index fa7bafbba960f987f4dac7a12fd3014efa8eebdb..4a1bd450223323ff04c92a2eac2e789d1e6c8920 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -290,6 +290,27 @@ public class PurpurWorldConfig {
--- a/patches/server/0067-Implement-respawn-anchor-explosion-options.patch
+++ b/patches/server/0067-Implement-respawn-anchor-explosion-options.patch
@@ -18,7 +18,7 @@ index 2ed78cf83c0ae66a6ddba1ff307da89a24b0d0a8..ae17d6a54fad0bd2d71d306f418b5ced
 
     public static boolean canSetSpawn(Level world) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 903c17260729b61ec0e4ad5d2fbe6aea7a18a64a..575c3375805a0f4995a097d1d316e9480f77110d 100644
+index 4a1bd450223323ff04c92a2eac2e789d1e6c8920..fce1ffd5a1d04a2a90d6a6eecc3736c79ef515fb 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -330,6 +330,27 @@ public class PurpurWorldConfig {
--- a/patches/server/0068-Add-allow-water-in-end-world-option.patch
+++ b/patches/server/0068-Add-allow-water-in-end-world-option.patch
@@ -68,10 +68,10 @@ index 5fbdc96f29e29dfc092b9e84a988032db0fa36ab..1352168db8f3062943cc05396cbd9b53
         } else {
             world.setBlockAndUpdate(pos, IceBlock.meltsInto());
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 106b2abc4f7070ec4d1c6790f78c05392df43eff..8a1fb43120da98c0c48d557125e59e43335bdb9e 100644
+index 8e99128759e555cdef0efe9cea1b3b36f2c3fda9..8575753af39d19e485f915e3e12e377c325b4751 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -242,6 +242,11 @@ public class PurpurConfig {
+@@ -244,6 +244,11 @@ public class PurpurConfig {
         enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
     }
 
--- a/patches/server/0069-Allow-color-codes-in-books.patch
+++ b/patches/server/0069-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 7d61ad24a1e8654ee0a0988b59c3f4b4598b306d..3e50675e6d531d4a80dc511e63afe2e04fe3065a 100644
+index 6ad34d0de6c5637f8c11c77ea8baee5ba040ff40..d7fbbc91dd72c0c93b973da773ca9b1bfb326677 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1344,13 +1344,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
--- a/patches/server/0070-Entity-lifespan.patch
+++ b/patches/server/0070-Entity-lifespan.patch
@@ -5,7 +5,7 @@ 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 3e50675e6d531d4a80dc511e63afe2e04fe3065a..5ceb3a454fbd6993fd82cacb83b3ba9844463054 100644
+index d7fbbc91dd72c0c93b973da773ca9b1bfb326677..25f502ef6248df703b73b955a1d1395d313094a3 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2856,6 +2856,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -17,7 +17,7 @@ index 3e50675e6d531d4a80dc511e63afe2e04fe3065a..5ceb3a454fbd6993fd82cacb83b3ba98
                     private void performInteraction(InteractionHand enumhand, ServerGamePacketListenerImpl.EntityInteraction playerconnection_a, PlayerInteractEntityEvent event) { // CraftBukkit
                         ItemStack itemstack = ServerGamePacketListenerImpl.this.player.getItemInHand(enumhand);
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index fdd0acaaf69f9325feaf8167e8122191a0c7e9d7..0509b57efe9a42bf44a8ff2c13a042bb2d3accf9 100644
+index 1b18532360b9508a08ea46b48331acad3e37c049..0101b6e0df2a6651a22c84d0fae4ebfb37f8e682 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -133,6 +133,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -94,7 +94,7 @@ index fdd0acaaf69f9325feaf8167e8122191a0c7e9d7..0509b57efe9a42bf44a8ff2c13a042bb
     }
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 575c3375805a0f4995a097d1d316e9480f77110d..aeb6b723f59a391e9933ae4d1f01b845d2e709e7 100644
+index fce1ffd5a1d04a2a90d6a6eecc3736c79ef515fb..f553c681956dc6d93c0bf864d054a25ce6236115 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -127,6 +127,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0071-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
+++ b/patches/server/0071-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index a6117d497bcf36e88d947e0aebb22ea9972b3fbb..5165f6d8189ec8e64cdb0902d61276571198f9a7 100644
+index b0eab4e73c85e4c18301978daac91a4b862617b0..375a6a12cabfdc798792166a60e3b18e8cbd7480 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2749,4 +2749,26 @@ public class ServerPlayer extends Player {
+@@ -2758,4 +2758,26 @@ public class ServerPlayer extends Player {
         return (CraftPlayer) super.getBukkitEntity();
     }
     // CraftBukkit end
@@ -36,10 +36,10 @@ index a6117d497bcf36e88d947e0aebb22ea9972b3fbb..5165f6d8189ec8e64cdb0902d6127657
 +    // 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 90ebbd8666a934fc3dce655a44cf4270a02d1bb1..098e5af37585488d667909fef4e06aff5ce578fc 100644
+index 7126ce61f58079d924bb86ff9257d75612bcc704..637d90f2f5e9f8807516a757ef82d5b2014c752b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -428,6 +428,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -429,6 +429,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
                         double d1 = this.level().getWorldBorder().getDamagePerBlock();
 
                         if (d1 > 0.0D) {
@@ -48,7 +48,7 @@ index 90ebbd8666a934fc3dce655a44cf4270a02d1bb1..098e5af37585488d667909fef4e06aff
                         }
                     }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index aeb6b723f59a391e9933ae4d1f01b845d2e709e7..84185a51eb9a9f6deef193a37d2fcb3dde120093 100644
+index f553c681956dc6d93c0bf864d054a25ce6236115..e62c71804a0595574e49cd08ce11eee52eab7479 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -246,6 +246,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0072-Squid-EAR-immunity.patch
+++ b/patches/server/0072-Squid-EAR-immunity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Squid EAR immunity


 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 84185a51eb9a9f6deef193a37d2fcb3dde120093..d536cb1acaae014292577df098821bce2a3142b3 100644
+index e62c71804a0595574e49cd08ce11eee52eab7479..31ff1a1e9f57f6d5bef77dc1038b5bc51a53ac6f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1097,6 +1097,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0073-Phantoms-burn-in-light.patch
+++ b/patches/server/0073-Phantoms-burn-in-light.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Phantoms burn in light


 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 07070846057b80eb24e6afa4ddcf39221df0c7b3..ca46d91d75de8aaf39a16141bba593be94cbc45f 100644
+index 5a44bead0ad10deb4ec7d90c86305ae178632e6c..b230733d72843f3142c26cc7d0e9bf93054fc628 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
@@ -49,6 +49,7 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -16,7 +16,7 @@ index 07070846057b80eb24e6afa4ddcf39221df0c7b3..ca46d91d75de8aaf39a16141bba593be
 
     public Phantom(EntityType<? extends Phantom> type, Level world) {
         super(type, world);
-@@ -162,7 +163,12 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -222,7 +223,12 @@ public class Phantom extends FlyingMob implements Enemy {
 
     @Override
     public void aiStep() {
@@ -27,10 +27,10 @@ index 07070846057b80eb24e6afa4ddcf39221df0c7b3..ca46d91d75de8aaf39a16141bba593be
 +        if (this.isAlive() && (burnFromDaylight || burnFromLightSource)) { // Paper - Configurable Burning
 +            if (getRider() == null || !this.isControllable())
 +            // Purpur end
+             if (getRider() == null || !this.isControllable()) // Purpur
             this.setSecondsOnFire(8);
         }
- 
-@@ -436,6 +442,12 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -514,6 +520,12 @@ public class Phantom extends FlyingMob implements Enemy {
                 return false;
             } else if (!entityliving.isAlive()) {
                 return false;
@@ -43,7 +43,7 @@ index 07070846057b80eb24e6afa4ddcf39221df0c7b3..ca46d91d75de8aaf39a16141bba593be
             } else {
                 if (entityliving instanceof Player) {
                     Player entityhuman = (Player) entityliving;
-@@ -581,6 +593,7 @@ public class Phantom extends FlyingMob implements Enemy {
+@@ -659,6 +671,7 @@ public class Phantom extends FlyingMob implements Enemy {
                 this.nextScanTick = reducedTickDelay(60);
                 List<Player> list = Phantom.this.level().getNearbyPlayers(this.attackTargeting, Phantom.this, Phantom.this.getBoundingBox().inflate(16.0D, 64.0D, 16.0D));
 
@@ -52,7 +52,7 @@ index 07070846057b80eb24e6afa4ddcf39221df0c7b3..ca46d91d75de8aaf39a16141bba593be
                     list.sort(Comparator.comparing((Entity e) -> { return e.getY(); }).reversed()); // CraftBukkit - decompile error
                     Iterator iterator = list.iterator();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index d536cb1acaae014292577df098821bce2a3142b3..25fd73c046f62848cbe016f5f9dfce2d2b2a03c6 100644
+index 31ff1a1e9f57f6d5bef77dc1038b5bc51a53ac6f..4f5f144127787b5deaca89f5fa97551c8caf4c28 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -875,6 +875,9 @@ public class PurpurWorldConfig {
--- a/patches/server/0074-Configurable-villager-breeding.patch
+++ b/patches/server/0074-Configurable-villager-breeding.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable villager breeding


 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index d2fcf2121ff9765fed268b2984a865329d27a17a..8144e3c60bc586bd48677a1d1af3b20f1a1fa337 100644
+index e258d5b83e5cb517b9fe2e2818391f0666cacd84..26d7b7de2dc2b59224311bc9541a5f0f0f386277 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-@@ -755,7 +755,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
+@@ -779,7 +779,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
 
     @Override
     public boolean canBreed() {
@@ -18,7 +18,7 @@ index d2fcf2121ff9765fed268b2984a865329d27a17a..8144e3c60bc586bd48677a1d1af3b20f
 
     private boolean hungry() {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 25fd73c046f62848cbe016f5f9dfce2d2b2a03c6..6c9a5b5696b042d5e9358fc5261b8965bdfaf01f 100644
+index 4f5f144127787b5deaca89f5fa97551c8caf4c28..da232210c18f9389dd51a30f4bf72b4e913513c2 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1201,6 +1201,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0075-Redstone-deactivates-spawners.patch
+++ b/patches/server/0075-Redstone-deactivates-spawners.patch
@@ -17,7 +17,7 @@ index 8fdbc603486ff8a902b6327bc2acfb86a806626e..cb9acec46677048bd8ffbb0e3f2f0378
     }
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6c9a5b5696b042d5e9358fc5261b8965bdfaf01f..2de35edebea612a2a0152fa7b9a504be27412d23 100644
+index da232210c18f9389dd51a30f4bf72b4e913513c2..bb136d077690654a8fa62a2aad73134487d07bd9 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -358,6 +358,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0076-Totems-work-in-inventory.patch
+++ b/patches/server/0076-Totems-work-in-inventory.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Totems work in inventory


 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 098e5af37585488d667909fef4e06aff5ce578fc..f8ed307bcc19eb5e0f3b9709fda623b1b2af9ae9 100644
+index 637d90f2f5e9f8807516a757ef82d5b2014c752b..1d0d22c9d3b8c907502b8fb044ebf8c5c49f6885 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -1591,6 +1591,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -1592,6 +1592,18 @@ public abstract class LivingEntity extends Entity implements Attackable {
                 }
             }
 
@@ -28,7 +28,7 @@ index 098e5af37585488d667909fef4e06aff5ce578fc..f8ed307bcc19eb5e0f3b9709fda623b1
             EntityResurrectEvent event = new EntityResurrectEvent((org.bukkit.entity.LivingEntity) this.getBukkitEntity(), handSlot);
             event.setCancelled(itemstack == null);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 2de35edebea612a2a0152fa7b9a504be27412d23..8467324a614a9181345fea7f125da6bb5ee61380 100644
+index bb136d077690654a8fa62a2aad73134487d07bd9..37f72c2812c8041a36fd7ec117e9274a8f2817c0 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -247,6 +247,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0077-Add-vindicator-johnny-spawn-chance.patch
+++ b/patches/server/0077-Add-vindicator-johnny-spawn-chance.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add vindicator johnny spawn chance


 diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-index 3bf6463d356f3ba64c2d5279cbf79c289fc09a8f..886d42e847b400f166ccbdf7a0f61744080a8b54 100644
+index fdbcf72f35b6801fed4db127710a72579c823fe1..db832e9c8287d0f62db65ff3a2d2625541758762 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-@@ -135,6 +135,12 @@ public class Vindicator extends AbstractIllager {
+@@ -154,6 +154,12 @@ public class Vindicator extends AbstractIllager {
         RandomSource randomSource = world.getRandom();
         this.populateDefaultEquipmentSlots(randomSource, difficulty);
         this.populateDefaultEquipmentEnchantments(randomSource, difficulty);
@@ -22,7 +22,7 @@ index 3bf6463d356f3ba64c2d5279cbf79c289fc09a8f..886d42e847b400f166ccbdf7a0f61744
     }
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8467324a614a9181345fea7f125da6bb5ee61380..854cbab07bed9848ef3975d53e7c3632480b2c99 100644
+index 37f72c2812c8041a36fd7ec117e9274a8f2817c0..2af26908978d364e24a6ebbd2ac3a7456f2d0cc3 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1222,6 +1222,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0078-Add-option-to-disable-certain-block-updates.patch
+++ b/patches/server/0078-Add-option-to-disable-certain-block-updates.patch
@@ -125,10 +125,10 @@ index 910864cfeac085648e6c671b0f9480417324d36e..6bc29eeb5771a3dc9aa23c7d184c8957
         }
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 8a1fb43120da98c0c48d557125e59e43335bdb9e..118eae57b4a63bb50ffb34c632122234ce0d2d43 100644
+index 8575753af39d19e485f915e3e12e377c325b4751..e829e215d1fe80cdaf9162268011912081f4c5ee 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -247,6 +247,15 @@ public class PurpurConfig {
+@@ -249,6 +249,15 @@ public class PurpurConfig {
         allowWaterPlacementInTheEnd = getBoolean("settings.allow-water-placement-in-the-end", allowWaterPlacementInTheEnd);
     }
 
--- a/patches/server/0079-Dispensers-place-anvils-option.patch
+++ b/patches/server/0079-Dispensers-place-anvils-option.patch
@@ -41,7 +41,7 @@ index b4f5dbe9022dd20437c15c4f6fbe2ac06dacbadb..b52a9f05ada86f2d3767dd0d5ba8705e
 
     static void setEntityPokingOutOfBlock(BlockSource pointer, Entity entity, Direction direction) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 854cbab07bed9848ef3975d53e7c3632480b2c99..63245a2ea4b5b4a8a0f42be0e15dbf1fdba18a7d 100644
+index 2af26908978d364e24a6ebbd2ac3a7456f2d0cc3..e9275427cc3337091054842558ec22c9bc34b419 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -321,8 +321,10 @@ public class PurpurWorldConfig {
--- a/patches/server/0080-Allow-anvil-colors.patch
+++ b/patches/server/0080-Allow-anvil-colors.patch
@@ -64,7 +64,7 @@ index b500a04b8135604f0159a741b3d228c9e87b2a46..6fc5699ad90127dc48fa9ff5cb6ba536
             }
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 63245a2ea4b5b4a8a0f42be0e15dbf1fdba18a7d..cc7809cbff311ccf28b85139d21d3ba9b7c5660d 100644
+index e9275427cc3337091054842558ec22c9bc34b419..2c7417affdf20fe15303d5f604530a8a3aba0060 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -299,6 +299,13 @@ public class PurpurWorldConfig {
--- a/patches/server/0081-Add-option-to-disable-dolphin-treasure-searching.patch
+++ b/patches/server/0081-Add-option-to-disable-dolphin-treasure-searching.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to disable dolphin treasure searching


 diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-index 376fe57c3518d42c887726338b15f59d072d8d87..1c8e81fd2561535a04d55238ad086a6cc6851d5d 100644
+index d8395f47cdf5ceffc1c65442e9d632847d22cca6..584b812c86d4f7180d971b5ad263c549dec51e61 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-@@ -406,6 +406,7 @@ public class Dolphin extends WaterAnimal {
+@@ -481,6 +481,7 @@ public class Dolphin extends WaterAnimal {
 
         @Override
         public boolean canUse() {
@@ -17,7 +17,7 @@ index 376fe57c3518d42c887726338b15f59d072d8d87..1c8e81fd2561535a04d55238ad086a6c
         }
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index cc7809cbff311ccf28b85139d21d3ba9b7c5660d..e4a04774f9951919f3f732aef3072da2037e1efc 100644
+index 2c7417affdf20fe15303d5f604530a8a3aba0060..ab550704781b799222aa0fe58dfe817ea31222e0 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -522,6 +522,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0082-Short-enderman-height.patch
+++ b/patches/server/0082-Short-enderman-height.patch
@@ -19,22 +19,22 @@ index b7e3efcca0b544440f8799a3be27e9288a55ca77..b144543131bb756294e02e05f83002fe
 
     private static <T extends Entity> EntityType<T> register(String id, EntityType.Builder type) { // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index d1602c71f96d817d212582737dc6ec5db1c4f79a..b74466455959c2355e40100004eed350205facdc 100644
+index 945abc20319819cca2631876cb0abca07f7a730a..ba7d9d2b6927dd20e82009d57d77f713ab9be8ab 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -403,6 +403,7 @@ public class EnderMan extends Monster implements NeutralMob {
-     public boolean hurt(DamageSource source, float amount) {
-         if (this.isInvulnerableTo(source)) {
+@@ -267,6 +267,7 @@ public class EnderMan extends Monster implements NeutralMob {
+ 
+         if (itemstack.is(Blocks.CARVED_PUMPKIN.asItem())) {
             return false;
 +        } else if (org.purpurmc.purpur.PurpurConfig.endermanShortHeight && source.is(net.minecraft.world.damagesource.DamageTypes.IN_WALL)) { return false; // Purpur - no suffocation damage if short height
         } else {
-             boolean flag = source.getDirectEntity() instanceof ThrownPotion;
-             boolean flag1;
+             Vec3 vec3d = player.getViewVector(1.0F).normalize();
+             Vec3 vec3d1 = new Vec3(this.getX() - player.getX(), this.getEyeY() - player.getEyeY(), this.getZ() - player.getZ());
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 118eae57b4a63bb50ffb34c632122234ce0d2d43..763b3753fd77766475114226db593b7ce941336a 100644
+index e829e215d1fe80cdaf9162268011912081f4c5ee..db4c85cae58805cfa2a460e33a13e85abc8e593d 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -242,6 +242,12 @@ public class PurpurConfig {
+@@ -244,6 +244,12 @@ public class PurpurConfig {
         enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
     }
 
--- a/patches/server/0083-Stop-squids-floating-on-top-of-water.patch
+++ b/patches/server/0083-Stop-squids-floating-on-top-of-water.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Stop squids floating on top of water


 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b26e19f67767ef5d0da819be44f0ca0aabc2bdbb..4813c72c4f828ee205fa4b3abaac11b4a6a482df 100644
+index cfef8dec1a96c97bd087ed6dc55eadae4feae079..aba657afb169a5cd563030e08f4c11305bd5a482 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4277,6 +4277,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4292,6 +4292,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
         this.yRotO = this.getYRot();
     }
 
@@ -22,12 +22,12 @@ index b26e19f67767ef5d0da819be44f0ca0aabc2bdbb..4813c72c4f828ee205fa4b3abaac11b4
         if (this.touchingUnloadedChunk()) {
             return false;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-index 55ca4f5e136cd902b2df425c8e65b12bfb45b28e..7922c3288f631dda9272951203d2a69a0cf993f5 100644
+index 47842db438bac4c571a11306b0621f30832bbd68..12235bede3232fbe8ffc5ec07cf3e16d5a08517f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-@@ -55,6 +55,12 @@ public class Squid extends WaterAnimal {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.squidMaxHealth);
+@@ -77,6 +77,12 @@ public class Squid extends WaterAnimal {
     }
+     // Purpur end
 
 +    @Override
 +    public net.minecraft.world.phys.AABB getAxisForFluidCheck() {
@@ -54,7 +54,7 @@ index ffc76354ead6937daf366c3d87bcb51d3e4c47f5..5b98d42b5d6bc07265fbb017e51a6281
 +    // Purpur
 }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index e4a04774f9951919f3f732aef3072da2037e1efc..a5cb13ac94d966d95c84aa3bb88fc7170e25c558 100644
+index ab550704781b799222aa0fe58dfe817ea31222e0..489e3f9d068d7987d2a676b3e567929775aeca17 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1122,6 +1122,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0084-Crying-obsidian-valid-for-portal-frames.patch
+++ b/patches/server/0084-Crying-obsidian-valid-for-portal-frames.patch
@@ -18,10 +18,10 @@ index c461e0d04047db9c0c5ecc04063cebd38bf96ec2..e7554ec800f321e4e34c926c53f2375a
     private static final float SAFE_TRAVEL_MAX_ENTITY_XY = 4.0F;
     private static final double SAFE_TRAVEL_MAX_VERTICAL_DELTA = 1.0D;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index 763b3753fd77766475114226db593b7ce941336a..a5d8ed8cc7b28d3fb88d04ff7f7995483f60c0a2 100644
+index db4c85cae58805cfa2a460e33a13e85abc8e593d..ba4dc732327e7661d39929dfa330a5b29cce9269 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -210,6 +210,7 @@ public class PurpurConfig {
+@@ -212,6 +212,7 @@ public class PurpurConfig {
     public static int barrelRows = 3;
     public static boolean enderChestSixRows = false;
     public static boolean enderChestPermissionRows = false;
@@ -29,7 +29,7 @@ index 763b3753fd77766475114226db593b7ce941336a..a5d8ed8cc7b28d3fb88d04ff7f799548
     private static void blockSettings() {
         if (version < 3) {
             boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
-@@ -240,6 +241,7 @@ public class PurpurConfig {
+@@ -242,6 +243,7 @@ public class PurpurConfig {
         enderChestSixRows = getBoolean("settings.blocks.ender_chest.six-rows", enderChestSixRows);
         org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
         enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
--- a/patches/server/0085-Entities-can-use-portals-configuration.patch
+++ b/patches/server/0085-Entities-can-use-portals-configuration.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entities can use portals configuration


 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4813c72c4f828ee205fa4b3abaac11b4a6a482df..091702e3946effa1177c1521f7c8c25f611e5c88 100644
+index aba657afb169a5cd563030e08f4c11305bd5a482..9f213ed6b14c24fd9cb5fefb689d72032a883d09 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2984,7 +2984,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -2999,7 +2999,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
     public void handleInsidePortal(BlockPos pos) {
         if (this.isOnPortalCooldown()) {
             this.setPortalCooldown();
@@ -17,7 +17,7 @@ index 4813c72c4f828ee205fa4b3abaac11b4a6a482df..091702e3946effa1177c1521f7c8c25f
             if (!this.level().isClientSide && !pos.equals(this.portalEntrancePos)) {
                 this.portalEntrancePos = pos.immutable();
             }
-@@ -3680,7 +3680,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3695,7 +3695,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
     }
 
     public boolean canChangeDimensions() {
@@ -27,7 +27,7 @@ index 4813c72c4f828ee205fa4b3abaac11b4a6a482df..091702e3946effa1177c1521f7c8c25f
 
     public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a5cb13ac94d966d95c84aa3bb88fc7170e25c558..8883a6364f0245f2814fab1bdf8ce8da4b625ae0 100644
+index 489e3f9d068d7987d2a676b3e567929775aeca17..7a4658b2eb4fb785809783dbf30c5abecd32c6d8 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -100,6 +100,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0086-LivingEntity-broadcastItemBreak.patch
+++ b/patches/server/0086-LivingEntity-broadcastItemBreak.patch
--- a/patches/server/0087-Customizable-wither-health-and-healing.patch
+++ b/patches/server/0087-Customizable-wither-health-and-healing.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Customizable wither health and healing
 Adds the ability to customize the health of the wither, as well as the amount that it heals, and how often.

 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 87a0d264d9b54e1b0b29f49431212c977864a30a..87c5dd63bd4a0dd045b5ff30105217562af7967c 100644
+index 0ecbee51a48171cad95cc80bd26644774064fead..52f6459b0bfff7991da6cb0deda1b15664c4d00b 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-@@ -399,8 +399,10 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
+@@ -529,8 +529,10 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
                 }
             }
 
@@ -23,7 +23,7 @@ index 87a0d264d9b54e1b0b29f49431212c977864a30a..87c5dd63bd4a0dd045b5ff3010521756
 
             this.bossEvent.setProgress(this.getHealth() / this.getMaxHealth());
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8883a6364f0245f2814fab1bdf8ce8da4b625ae0..c4fbdb55b9f9b90a7fe6ed6ac84e7e775d163b65 100644
+index 7a4658b2eb4fb785809783dbf30c5abecd32c6d8..0c0c2745a18593ee7da491d0f1b5c0d11aa1a3c4 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1273,6 +1273,8 @@ public class PurpurWorldConfig {
--- a/patches/server/0088-Allow-toggling-special-MobSpawners-per-world.patch
+++ b/patches/server/0088-Allow-toggling-special-MobSpawners-per-world.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Allow toggling special MobSpawners per world
 In vanilla, these are all hardcoded on for world type 0 (overworld) and hardcoded off for every other world type. Default config behaviour matches this.

 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index ac9f7e786d2e2042b8694a4ddd2f806758f9ea50..51c896fdc802ca33e9b8c5dabb66ebb771d8abd5 100644
+index e2b1433034b1ab9bad821983515a37fd12ba4b37..854e6e73a7fa9c2cd4f0b9beadbff6427c8346e5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -581,7 +581,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -582,7 +582,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
         this.dragonParts = new Int2ObjectOpenHashMap();
         this.tickTime = flag1;
         this.server = minecraftserver;
@@ -59,7 +59,7 @@ index 5d199fe497bd852827d3d18fb7566a09e70331a3..6cd8a50289a6404441e9e5e08d82d2eb
             if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, world, blockposition2, EntityType.WANDERING_TRADER)) {
                 blockposition1 = blockposition2;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c4fbdb55b9f9b90a7fe6ed6ac84e7e775d163b65..72e47882c87754ba3208f59c945c2347904af51a 100644
+index 0c0c2745a18593ee7da491d0f1b5c0d11aa1a3c4..88f3a76e1b88d70c781eb04c4c3de627d151e3df 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -71,6 +71,12 @@ public class PurpurWorldConfig {
--- a/patches/server/0089-Raid-cooldown-setting.patch
+++ b/patches/server/0089-Raid-cooldown-setting.patch
@@ -49,7 +49,7 @@ index 41457c9f27b18fa2734a6cca297ec5186470e82f..94356e0541f8f4da68211fa533347cc9
                     if (!this.raidMap.containsKey(raid.getId())) {
                         this.raidMap.put(raid.getId(), raid);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 72e47882c87754ba3208f59c945c2347904af51a..042fb9536cfa5b5cb243a4c4993f1f98bb792304 100644
+index 88f3a76e1b88d70c781eb04c4c3de627d151e3df..44af2919281fe6afc08401d68ba421e4ea963136 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -111,6 +111,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0090-Despawn-rate-config-options-per-projectile-type.patch
+++ b/patches/server/0090-Despawn-rate-config-options-per-projectile-type.patch
@@ -7,7 +7,7 @@ This patch's implementation has been removed in favor of Pufferfish's entity-tim
 The config remains for migration purposes.

 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 042fb9536cfa5b5cb243a4c4993f1f98bb792304..628b11a39dd923c8faa5c7963eb369d1a953dfc2 100644
+index 44af2919281fe6afc08401d68ba421e4ea963136..f6ee6a36d85531b5c39bb49c6b5a97dd7eb06444 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -292,6 +292,39 @@ public class PurpurWorldConfig {
--- a/patches/server/0091-Add-option-to-disable-zombie-aggressiveness-towards-.patch
+++ b/patches/server/0091-Add-option-to-disable-zombie-aggressiveness-towards-.patch
@@ -2,7 +2,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: nitricspace <nitricspace@users.noreply.github.com>
 Date: Mon, 21 Sep 2020 23:19:43 +0100
 Subject: [PATCH] Add option to disable zombie aggressiveness towards villagers
- when lagging


 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
@@ -21,10 +20,10 @@ index a08c00b8c0488d18be5e182f7892e5ab71d12247..338f693d098b6ab507c30f6411c9a952
         ignored.add("goal_selector_1");
         ignored.add("goal_selector_2");
 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 c5e3a361c5a31ae78156079f9e039ff8adb36151..366f4d7e5e640d1b906dc532ea1e2d323c293a51 100644
+index a27a0de6858aa69caefc436aec3827b365d3d00c..59bfc5df56ef7bab39630f69bc69d122fcd1653e 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-@@ -103,7 +103,19 @@ public class Drowned extends Zombie implements RangedAttackMob {
+@@ -120,7 +120,19 @@ public class Drowned extends Zombie implements RangedAttackMob {
         this.goalSelector.addGoal(7, new RandomStrollGoal(this, 1.0D));
         this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, new Class[]{Drowned.class})).setAlertOthers(ZombifiedPiglin.class));
         this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, this::okTarget));
@@ -46,10 +45,10 @@ index c5e3a361c5a31ae78156079f9e039ff8adb36151..366f4d7e5e640d1b906dc532ea1e2d32
         this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, Axolotl.class, true, false));
         this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
 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 6f20140adb276c0a08644cc3fb7d6b29982e8697..fddee85b60de8fe75f6a6bab43a0989509850b18 100644
+index a0439eac45376c132f6a1d7142c200e9c925130c..57a1ea56cfc6b0b8fe3a3379c9a602cf46fd8fbd 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-@@ -137,7 +137,19 @@ public class Zombie extends Monster {
+@@ -156,7 +156,19 @@ public class Zombie extends Monster {
         this.goalSelector.addGoal(7, new WaterAvoidingRandomStrollGoal(this, 1.0D));
         this.targetSelector.addGoal(1, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers(ZombifiedPiglin.class));
         this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
@@ -71,7 +70,7 @@ index 6f20140adb276c0a08644cc3fb7d6b29982e8697..fddee85b60de8fe75f6a6bab43a09895
         this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
     }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 628b11a39dd923c8faa5c7963eb369d1a953dfc2..aa2da3d779edc5f45aa2fad5ba0cc82dee2821b3 100644
+index f6ee6a36d85531b5c39bb49c6b5a97dd7eb06444..f211d89ab4035cb59c2b0aeb0781cfd7261b992b 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1381,6 +1381,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0092-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
+++ b/patches/server/0092-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
--- a/patches/server/0093-Flying-squids-Oh-my.patch
+++ b/patches/server/0093-Flying-squids-Oh-my.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Flying squids! Oh my!


 diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
-index 213f89b22650f43daaec01e7c301e3e8a7e98684..8d2a915280f7a010483720295077f66684f49615 100644
+index aa155ec559e748c9bbb6ccddaa278ea6bba7ac63..277a5868b3fc4bbb472086b4fb50e905b02621ba 100644
 --- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
 +++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
-@@ -28,6 +28,11 @@ public class GlowSquid extends Squid {
-         this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.glowSquidMaxHealth);
+@@ -41,6 +41,11 @@ public class GlowSquid extends Squid {
     }
+     // Purpur end
 
 +    @Override
 +    public boolean canFly() {
@@ -21,10 +21,10 @@ index 213f89b22650f43daaec01e7c301e3e8a7e98684..8d2a915280f7a010483720295077f666
     protected ParticleOptions getInkParticle() {
         return ParticleTypes.GLOW_SQUID_INK;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-index 7922c3288f631dda9272951203d2a69a0cf993f5..77ef1ae92dee5bf13590312466c778a249129d69 100644
+index 12235bede3232fbe8ffc5ec07cf3e16d5a08517f..2658be0f3535243b5a434917c9400332246ffcbe 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-@@ -61,6 +61,15 @@ public class Squid extends WaterAnimal {
+@@ -83,6 +83,15 @@ public class Squid extends WaterAnimal {
         return super.getAxisForFluidCheck().offsetY(level.purpurConfig.squidOffsetWaterCheck);
     }
 
@@ -40,7 +40,7 @@ index 7922c3288f631dda9272951203d2a69a0cf993f5..77ef1ae92dee5bf13590312466c778a2
     @Override
     protected void registerGoals() {
         this.goalSelector.addGoal(0, new Squid.SquidRandomMovementGoal(this));
-@@ -132,6 +141,7 @@ public class Squid extends WaterAnimal {
+@@ -155,6 +164,7 @@ public class Squid extends WaterAnimal {
         }
 
         if (this.isInWaterOrBubble()) {
@@ -48,7 +48,7 @@ index 7922c3288f631dda9272951203d2a69a0cf993f5..77ef1ae92dee5bf13590312466c778a2
             if (this.tentacleMovement < 3.1415927F) {
                 float f = this.tentacleMovement / 3.1415927F;
 
-@@ -259,7 +269,7 @@ public class Squid extends WaterAnimal {
+@@ -314,7 +324,7 @@ public class Squid extends WaterAnimal {
 
             if (i > 100) {
                 this.squid.setMovementVector(0.0F, 0.0F, 0.0F);
@@ -58,7 +58,7 @@ index 7922c3288f631dda9272951203d2a69a0cf993f5..77ef1ae92dee5bf13590312466c778a2
                 float f1 = Mth.cos(f) * 0.2F;
                 float f2 = -0.1F + this.squid.getRandom().nextFloat() * 0.2F;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index aa2da3d779edc5f45aa2fad5ba0cc82dee2821b3..c86d23a5db586bda0272f2985d53cf5e209b6302 100644
+index f211d89ab4035cb59c2b0aeb0781cfd7261b992b..37b6eb3ad99ffe2216bc1fe991c44cbe7b70bd40 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -738,8 +738,10 @@ public class PurpurWorldConfig {
--- a/patches/server/0094-Infinity-bow-settings.patch
+++ b/patches/server/0094-Infinity-bow-settings.patch
@@ -27,7 +27,7 @@ index 08d597db1a5345a343777a01427655e6bf2c926b..33df0ca406dc8321b76b393f317bbd1c
         } else {
             user.startUsingItem(hand);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index c86d23a5db586bda0272f2985d53cf5e209b6302..a672ee05bd19950ce4078e15e44068c025ceb1fe 100644
+index 37b6eb3ad99ffe2216bc1fe991c44cbe7b70bd40..1e92e006241e6e8d189081232d2430cfd590586d 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -142,6 +142,17 @@ public class PurpurWorldConfig {
--- a/patches/server/0095-Configurable-daylight-cycle.patch
+++ b/patches/server/0095-Configurable-daylight-cycle.patch
@@ -18,7 +18,7 @@ index 9ec6145fe04ec64bbee8ec6a837719caebdbc6f5..358d610ad020cada1bb83e393deeeaae
     public ClientboundSetTimePacket(long time, long timeOfDay, boolean doDaylightCycle) {
         this.gameTime = time;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cd883e14611cdb5ab74861b669e64a6445d9de9c..5750934e3cfb1a9d7fc127a5033c504476900981 100644
+index 6e5bfabe11da547f28b1d56e5a279ae5d9bb3c54..1b24b67437b1a677bbd6ea30b32c703fd7eda2a2 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1519,7 +1519,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -31,7 +31,7 @@ index cd883e14611cdb5ab74861b669e64a6445d9de9c..5750934e3cfb1a9d7fc127a5033c5044
                 }
                 ServerPlayer entityplayer = (ServerPlayer) entityhuman;
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 51c896fdc802ca33e9b8c5dabb66ebb771d8abd5..89de2c9a85068c32cc42927fc22aa42ea05a1519 100644
+index 854e6e73a7fa9c2cd4f0b9beadbff6427c8346e5..3b512beac50bc5a2405ca3287b08e7ffcb620313 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -214,6 +214,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -43,7 +43,7 @@ index 51c896fdc802ca33e9b8c5dabb66ebb771d8abd5..89de2c9a85068c32cc42927fc22aa42e
     private final RandomSequences randomSequences;
     public long lastMidTickExecuteFailure; // Paper - execute chunk tasks mid tick
 
-@@ -668,6 +670,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -669,6 +671,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
 
         this.chunkTaskScheduler = new io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler(this, io.papermc.paper.chunk.system.scheduling.ChunkTaskScheduler.workerThreads); // Paper - rewrite chunk system
         this.entityLookup = new io.papermc.paper.chunk.system.entity.EntityLookup(this, new EntityCallbacks()); // Paper - rewrite chunk system
@@ -51,7 +51,7 @@ index 51c896fdc802ca33e9b8c5dabb66ebb771d8abd5..89de2c9a85068c32cc42927fc22aa42e
     }
 
     // Paper start
-@@ -837,6 +840,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -838,6 +841,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
             this.serverLevelData.setGameTime(i);
             this.serverLevelData.getScheduledEvents().tick(this.server, i);
             if (this.levelData.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) {
@@ -65,7 +65,7 @@ index 51c896fdc802ca33e9b8c5dabb66ebb771d8abd5..89de2c9a85068c32cc42927fc22aa42e
                 this.setDayTime(this.levelData.getDayTime() + 1L);
             }
 
-@@ -845,7 +855,21 @@ public class ServerLevel extends Level implements WorldGenLevel {
+@@ -846,7 +856,21 @@ public class ServerLevel extends Level implements WorldGenLevel {
 
     public void setDayTime(long timeOfDay) {
         this.serverLevelData.setDayTime(timeOfDay);
@@ -88,7 +88,7 @@ index 51c896fdc802ca33e9b8c5dabb66ebb771d8abd5..89de2c9a85068c32cc42927fc22aa42e
     public void tickCustomSpawners(boolean spawnMonsters, boolean spawnAnimals) {
         Iterator iterator = this.customSpawners.iterator();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a672ee05bd19950ce4078e15e44068c025ceb1fe..24c711fb7b9a3815c43352899475a61add5c070a 100644
+index 1e92e006241e6e8d189081232d2430cfd590586d..88567bc4f504b00bec3841da194a0bd17abf9ce7 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -124,6 +124,13 @@ public class PurpurWorldConfig {
--- a/patches/server/0096-Allow-infinite-and-mending-enchantments-together.patch
+++ b/patches/server/0096-Allow-infinite-and-mending-enchantments-together.patch
@@ -17,10 +17,10 @@ index 518d85a13c37a2f7d32ca0718323181048559986..2c4ce164ab3011f372ff1719c8d4a333
     }
 }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-index a5d8ed8cc7b28d3fb88d04ff7f7995483f60c0a2..cac902dae062d706c6ba255f74fc0f82378df241 100644
+index ba4dc732327e7661d39929dfa330a5b29cce9269..4e303fc793bef67426308204d704b02960fc75b8 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
-@@ -244,6 +244,16 @@ public class PurpurConfig {
+@@ -246,6 +246,16 @@ public class PurpurConfig {
         cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
     }
 
--- a/patches/server/0097-Furnace-uses-lava-from-underneath.patch
+++ b/patches/server/0097-Furnace-uses-lava-from-underneath.patch
@@ -47,7 +47,7 @@ index 448fa4f4f200430d6ce3051763c7ceb697696146..ca2052804ad829a1528a9c5a0a792275
 
     private static boolean canBurn(RegistryAccess registryManager, @Nullable Recipe<?> recipe, NonNullList<ItemStack> slots, int count) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 421f08c047af617141f08682742fb81c7e077f94..0fec88e696fe1c0cc241ed296e5a8ad4435e251e 100644
+index 88567bc4f504b00bec3841da194a0bd17abf9ce7..4d14c68c3d5a5ee8070a678740283c5b2938b7bf 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -415,6 +415,17 @@ public class PurpurWorldConfig {
--- a/patches/server/0098-Arrows-should-not-reset-despawn-counter.patch
+++ b/patches/server/0098-Arrows-should-not-reset-despawn-counter.patch
@@ -20,7 +20,7 @@ index 7226be19248a1ffb8ff2c89b55882529d33a6c0c..57f89ff7ddcd738100f296ae7a21b324
 
     @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 0fec88e696fe1c0cc241ed296e5a8ad4435e251e..698dff77d5507f8da1170757a77e790598102c30 100644
+index 4d14c68c3d5a5ee8070a678740283c5b2938b7bf..9613301106d4f5ef9121400f8a32205428b6f4bf 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -103,6 +103,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0099-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
+++ b/patches/server/0099-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
@@ -24,7 +24,7 @@ index d446b440e2bc5b73362fc3d30a10d2e52fde68e1..d4e3a32a0f9b49bff64cb43d77727ce3
                 return;
             }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 698dff77d5507f8da1170757a77e790598102c30..fbde69170f19333faa02552f0bccc4fbaf04ef14 100644
+index 9613301106d4f5ef9121400f8a32205428b6f4bf..90c9d40009d2e93732110915447190b81c902393 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -416,8 +416,10 @@ public class PurpurWorldConfig {
--- a/patches/server/0100-Add-adjustable-breeding-cooldown-to-config.patch
+++ b/patches/server/0100-Add-adjustable-breeding-cooldown-to-config.patch
@@ -104,7 +104,7 @@ index 8673d325bd866704ae90ac31eb54f78097eac952..10cff85dd4a59558dd487a3c5c7871a0
         this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index fbde69170f19333faa02552f0bccc4fbaf04ef14..0780e76f12cd36744e5682860cf399634d4d137c 100644
+index 90c9d40009d2e93732110915447190b81c902393..1e1cfe78113742ea865ca56d5bbf01483d2e0a2c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -117,6 +117,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0101-Make-entity-breeding-times-configurable.patch
+++ b/patches/server/0101-Make-entity-breeding-times-configurable.patch
@@ -47,10 +47,10 @@ index e3a0a2914db92c95c894174e3815e3eca8d70826..4643c07bc2a26e7886b714514b7a4a05
         entityanimal.resetLove();
         worldserver.broadcastEntityEvent(this, (byte) 18);
 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 cd960eaeb3b86177b962db69173112f746bc52e1..d50f80e1b6ba690c25fb2993f596f2329bd422a3 100644
+index 5c1d0546c014c3a739311c8a8432e5cd1d8cacbc..e0ab585b708fd58db9688fc4631eaacd79a7c8a3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-@@ -420,6 +420,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
+@@ -471,6 +471,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.beeMaxHealth);
     }
 
@@ -63,12 +63,12 @@ index cd960eaeb3b86177b962db69173112f746bc52e1..d50f80e1b6ba690c25fb2993f596f232
     public int getRemainingPersistentAngerTime() {
         return (Integer) this.entityData.get(Bee.DATA_REMAINING_ANGER_TIME);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-index 3981a2b7501ceb62562785b2ace5990473919fa0..a47718747f41a80b5aecffdf74aa1095786cf9a3 100644
+index 845781610102d2ef89522619b8059073cc48b75d..a312e8ff4e4cd3328f0586348a2eff3deaf4617d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-@@ -102,6 +102,11 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.catMaxHealth);
+@@ -127,6 +127,11 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
     }
+     // Purpur end
 
 +    @Override
 +    public int getPurpurBreedTime() {
@@ -79,12 +79,12 @@ index 3981a2b7501ceb62562785b2ace5990473919fa0..a47718747f41a80b5aecffdf74aa1095
         return this.getVariant().texture();
     }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-index 7d6307aed4d1c15edf2008715ec90f61aac42046..6ade6225e83bab038aab91637a425616cab2853e 100644
+index bf281b45979e16551fe4777ff69fb9ef67d1f839..5ad29dda33d3d7442992b2d47f44d419dda3021b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-@@ -62,6 +62,11 @@ public class Chicken extends Animal {
-         }
+@@ -79,6 +79,11 @@ public class Chicken extends Animal {
     }
+     // Purpur end
 
 +    @Override
 +    public int getPurpurBreedTime() {
@@ -95,12 +95,12 @@ index 7d6307aed4d1c15edf2008715ec90f61aac42046..6ade6225e83bab038aab91637a425616
     protected void registerGoals() {
         this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-index 2d8f51fd2f9562ccffe25a965aa02613eed3d71b..154829bdef01a0a93f163578ea8e51a0cb3952e5 100644
+index 07d60d3f49a4ed67cc4739baddbb41818b557eb1..fd8ec46ccb691d7f85a7a6bb44e1d0db3703b4d6 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-@@ -48,6 +48,11 @@ public class Cow extends Animal {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.cowMaxHealth);
+@@ -65,6 +65,11 @@ public class Cow extends Animal {
     }
+     // Purpur end
 
 +    @Override
 +    public int getPurpurBreedTime() {
@@ -111,12 +111,12 @@ index 2d8f51fd2f9562ccffe25a965aa02613eed3d71b..154829bdef01a0a93f163578ea8e51a0
     protected void registerGoals() {
         this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index 5ee2f4d9e0bb97de9cb8bd3b2c4b6280c607b323..a80d18398db003ddeaa28aa00e13a0869191695f 100644
+index 71fba6fd95f362916e93e89b626dad7c7a72da0b..2232af2cef82014570596c122e11a47d3ae15b9b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-@@ -148,6 +148,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.foxMaxHealth);
+@@ -186,6 +186,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
     }
+     // Purpur end
 
 +    @Override
 +    public int getPurpurBreedTime() {
@@ -126,7 +126,7 @@ index 5ee2f4d9e0bb97de9cb8bd3b2c4b6280c607b323..a80d18398db003ddeaa28aa00e13a086
     @Override
     protected void defineSynchedData() {
         super.defineSynchedData();
-@@ -941,8 +946,10 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
+@@ -981,8 +986,10 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
                     CriteriaTriggers.BRED_ANIMALS.trigger(entityplayer2, this.animal, this.partner, entityfox);
                 }
 
@@ -140,12 +140,12 @@ index 5ee2f4d9e0bb97de9cb8bd3b2c4b6280c607b323..a80d18398db003ddeaa28aa00e13a086
                 this.partner.resetLove();
                 worldserver.addFreshEntityWithPassengers(entityfox, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.BREEDING); // CraftBukkit - added SpawnReason
 diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-index 841d97651827c24350854fa16f9c65e8daf70d55..6d7fd5bab1173e99eb8f2b67d202b22abaad28bb 100644
+index 3e798a9d94963dc39ec4a81265fa659b6cfe5db8..6bc5cca1c0896dda25af505e7ff3d68e5e83a54b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-@@ -68,6 +68,11 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
-         this.getAttribute(net.minecraft.world.entity.ai.attributes.Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.mooshroomMaxHealth);
+@@ -85,6 +85,11 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
     }
+     // Purpur end
 
 +    @Override
 +    public int getPurpurBreedTime() {
@@ -156,12 +156,12 @@ index 841d97651827c24350854fa16f9c65e8daf70d55..6d7fd5bab1173e99eb8f2b67d202b22a
     public float getWalkTargetValue(BlockPos pos, LevelReader world) {
         return world.getBlockState(pos.below()).is(Blocks.MYCELIUM) ? 10.0F : world.getPathfindingCostFromLightLevels(pos);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
-index 68b5a8c608fea6fa110313a6353471e758655e27..42e838e1d41353c42342c8a06e110e8e650a3ca5 100644
+index 1561ee4f27f05adfbb4a0a838615ce47e4bf84c8..237e672925b946dd7dd1e4c502d60daaad7a707b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
-@@ -73,6 +73,11 @@ public class Ocelot extends Animal {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.ocelotMaxHealth);
+@@ -90,6 +90,11 @@ public class Ocelot extends Animal {
     }
+     // Purpur end
 
 +    @Override
 +    public int getPurpurBreedTime() {
@@ -172,12 +172,12 @@ index 68b5a8c608fea6fa110313a6353471e758655e27..42e838e1d41353c42342c8a06e110e8e
         return (Boolean) this.entityData.get(Ocelot.DATA_TRUSTING);
     }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index 1ce3b2d3b69b702155ac344482d588be738edf8d..b5c4277efab43543cca5605a4fd6d02df33a151c 100644
+index e1b4092d245c4e30f8a028378b16f480a710d274..1eddcbfe32a9744982b62667068b88eecf68d81e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-@@ -114,6 +114,11 @@ public class Panda extends Animal {
-         setAttributes();
+@@ -140,6 +140,11 @@ public class Panda extends Animal {
     }
+     // Purpur end
 
 +    @Override
 +    public int getPurpurBreedTime() {
@@ -188,12 +188,12 @@ index 1ce3b2d3b69b702155ac344482d588be738edf8d..b5c4277efab43543cca5605a4fd6d02d
     public boolean canTakeItem(ItemStack stack) {
         EquipmentSlot enumitemslot = Mob.getEquipmentSlotForItem(stack);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-index 55fd983a41714a6cf8af950d0222bb70ab38ced4..f36afb818845b65058891db18575913ceb768b66 100644
+index d32fdd557fff9b99835c97967a49455da7872237..75ac34b0e65d593b424f23ab5756e31c8b68950d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-@@ -140,6 +140,11 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.parrotMaxHealth);
+@@ -196,6 +196,11 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
     }
+     // Purpur end
 
 +    @Override
 +    public int getPurpurBreedTime() {
@@ -204,12 +204,12 @@ index 55fd983a41714a6cf8af950d0222bb70ab38ced4..f36afb818845b65058891db18575913c
     @Override
     public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType spawnReason, @Nullable SpawnGroupData entityData, @Nullable CompoundTag entityNbt) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Pig.java b/src/main/java/net/minecraft/world/entity/animal/Pig.java
-index 978d4e1816e1f7fb55ae69e4cb272740e095f711..3a1669cbd8309b4c03c7efb9e554423484d096ae 100644
+index 2bd72ba2112c7212f331e6ca2655f557eee241d9..cb7e46b5db2980db62bb65e2f5db7428e37140be 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
-@@ -69,6 +69,11 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.pigMaxHealth);
+@@ -86,6 +86,11 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
     }
+     // Purpur end
 
 +    @Override
 +    public int getPurpurBreedTime() {
@@ -220,10 +220,10 @@ index 978d4e1816e1f7fb55ae69e4cb272740e095f711..3a1669cbd8309b4c03c7efb9e5544234
     protected void registerGoals() {
         this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-index 071236ec8534dfce2560ca14c09865fc053ab36a..5bbd66ceb757a23bd67690a9e0b5b39b266fcee1 100644
+index 05739e69f1a11138d7c13bb9d8ca7695753ae40c..a2bc1c0d01770da3fa8de876e4067c71c7a25646 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-@@ -91,6 +91,11 @@ public class PolarBear extends Animal implements NeutralMob {
+@@ -120,6 +120,11 @@ public class PolarBear extends Animal implements NeutralMob {
         }
     }
 
@@ -236,12 +236,12 @@ index 071236ec8534dfce2560ca14c09865fc053ab36a..5bbd66ceb757a23bd67690a9e0b5b39b
     @Override
     public AgeableMob getBreedOffspring(ServerLevel world, AgeableMob entity) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-index 1e8627f92580d791601fddb01f73b281797c06cb..c2106749af90e0fa0603ef90be919ef11da32758 100644
+index f7a1b15bd29e9c0848141da469acbfb67e8d8e4d..857d4a70c8a9678e689ee0807f42cd5f7cc4902d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-@@ -96,6 +96,11 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.rabbitMaxHealth);
+@@ -142,6 +142,11 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
     }
+     // Purpur end
 
 +    @Override
 +    public int getPurpurBreedTime() {
@@ -252,12 +252,12 @@ index 1e8627f92580d791601fddb01f73b281797c06cb..c2106749af90e0fa0603ef90be919ef1
     public void initializePathFinderGoals(){
         this.setSpeedModifier(0.0D);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-index 5886a9a40cbac1a97d4213d4a806802359953d18..34ddf57d47dc82b87ad9898c91b7891b8255455f 100644
+index 99ed0cf1bb04df94f3ac3b9acd2076a26d43ab1e..fbaa05f3564aeaf31bfaac34ef0112d11869a2c8 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-@@ -122,6 +122,11 @@ public class Sheep extends Animal implements Shearable {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.sheepMaxHealth);
+@@ -139,6 +139,11 @@ public class Sheep extends Animal implements Shearable {
     }
+     // Purpur end
 
 +    @Override
 +    public int getPurpurBreedTime() {
@@ -268,12 +268,12 @@ index 5886a9a40cbac1a97d4213d4a806802359953d18..34ddf57d47dc82b87ad9898c91b7891b
     protected void registerGoals() {
         this.eatBlockGoal = new EatBlockGoal(this);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-index fc98554897f009352f1869d3e5a42d209a8d520c..2f685d2512d8bd3cb41dd1b652ca2c2fb805b83b 100644
+index 68b50ffd17e4061c0dba0fb3452cb86014c88e89..726b53822d115fdd6f8911258ff9fc612a4ad54e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-@@ -88,6 +88,11 @@ public class Turtle extends Animal {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.turtleMaxHealth);
+@@ -105,6 +105,11 @@ public class Turtle extends Animal {
     }
+     // Purpur end
 
 +    @Override
 +    public int getPurpurBreedTime() {
@@ -284,12 +284,12 @@ index fc98554897f009352f1869d3e5a42d209a8d520c..2f685d2512d8bd3cb41dd1b652ca2c2f
         this.entityData.set(Turtle.HOME_POS, pos.immutable()); // Paper - called with mutablepos...
     }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index 123bb0b0a8437935ae5dafbe93b44eb268d1b4c0..d914f8d659404e0e8c499e2cd8bf0a3a6d21905e 100644
+index d74b9426116770ad42b5ceb85ce9a19fe11db74a..3cd49c57d6dc4b0db31c3ac40447c89ce7e193d7 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-@@ -107,6 +107,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.wolfMaxHealth);
+@@ -129,6 +129,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
     }
+     // Purpur end
 
 +    @Override
 +    public int getPurpurBreedTime() {
@@ -300,12 +300,12 @@ index 123bb0b0a8437935ae5dafbe93b44eb268d1b4c0..d914f8d659404e0e8c499e2cd8bf0a3a
     protected void registerGoals() {
         this.goalSelector.addGoal(1, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-index d90bf5a45466525c9a04d54b02d366861423be8f..4ce8b7cfdbbb475e257fe91ea541669361b92173 100644
+index 11f24bf5886ffccd05b8f78ce960fa3c1ad76856..be44bbd6dd3278ae533f07bbd1f4fb3727f177b7 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-@@ -103,6 +103,11 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.axolotlMaxHealth);
+@@ -120,6 +120,11 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
     }
+     // Purpur end
 
 +    @Override
 +    public int getPurpurBreedTime() {
@@ -334,12 +334,12 @@ index 95fbdb0e9c59edeb647fe0e5d51d5e6a35152cd6..eb7c9846aa01ec0f5e46c24005110b6e
     public void addAdditionalSaveData(CompoundTag nbt) {
         super.addAdditionalSaveData(nbt);
 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 22eb0a8fc35baa04b34265b62aa29a71f3cc7343..177db290818ebd80cdcd74c4e86074bf19a884aa 100644
+index b6751a90d5ae004accd08ad23c12e18b7abe2118..2cde912c79656199d31bea2d0c84d72cfb1b2a05 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
-@@ -87,6 +87,10 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
-         this.setMaxUpStep(1.0F);
+@@ -136,6 +136,10 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
     }
+     // Purpur end
 
 +    public int getPurpurBreedTime() {
 +        return this.level.purpurConfig.frogBreedingTicks;
@@ -349,12 +349,12 @@ index 22eb0a8fc35baa04b34265b62aa29a71f3cc7343..177db290818ebd80cdcd74c4e86074bf
     protected Brain.Provider<Frog> brainProvider() {
         return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index 528e7ba29dcd38726b2c1bbc1d8ac208c64ba9df..2c1a6321f46a029ddc1c4e4c0afe07516c874843 100644
+index b1d78fd5674826b021b9f300647b1957daa8ba08..4f7256e6e130be1e84be3b2979b836021460aceb 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-@@ -89,6 +89,11 @@ public class Goat extends Animal {
-         return InstrumentItem.create(Items.GOAT_HORN, (Holder) holderset.getRandomElement(randomsource).get());
+@@ -106,6 +106,11 @@ public class Goat extends Animal {
     }
+     // Purpur end
 
 +    @Override
 +    public int getPurpurBreedTime() {
@@ -365,12 +365,12 @@ index 528e7ba29dcd38726b2c1bbc1d8ac208c64ba9df..2c1a6321f46a029ddc1c4e4c0afe0751
     protected Brain.Provider<Goat> brainProvider() {
         return Brain.provider(Goat.MEMORY_TYPES, Goat.SENSOR_TYPES);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
-index d3e8b9ddc42c506f8a0b696becc2ca63414db76f..11dc7cf7cd38994edb6e8c1ed0761e45bc998bfc 100644
+index e0568b3401f42ffd5cfd35da52c0a20d8626776e..a9e04b76c0a3831e6b136136ae15dd9884d68148 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
-@@ -30,6 +30,11 @@ public class Donkey extends AbstractChestedHorse {
-         return generateSpeed(this.level.purpurConfig.donkeyMovementSpeedMin, this.level.purpurConfig.donkeyMovementSpeedMax);
+@@ -37,6 +37,11 @@ public class Donkey extends AbstractChestedHorse {
     }
+     // Purpur end
 
 +    @Override
 +    public int getPurpurBreedTime() {
@@ -381,12 +381,12 @@ index d3e8b9ddc42c506f8a0b696becc2ca63414db76f..11dc7cf7cd38994edb6e8c1ed0761e45
     protected SoundEvent getAmbientSound() {
         return SoundEvents.DONKEY_AMBIENT;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
-index 62f7cdc02e7eb15a96f20ff48470d9869ec82d59..97cbd228dd33333468e545697530bbd14de86308 100644
+index 508111fef316d765d284af31263d5c0dda751774..65fec83d96a02bd3b7c9ba034db95a2bb0833dba 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
-@@ -55,6 +55,11 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
-         return generateSpeed(this.level.purpurConfig.horseMovementSpeedMin, this.level.purpurConfig.horseMovementSpeedMax);
+@@ -62,6 +62,11 @@ public class Horse extends AbstractHorse implements VariantHolder<Variant> {
     }
+     // Purpur end
 
 +    @Override
 +    public int getPurpurBreedTime() {
@@ -397,12 +397,12 @@ index 62f7cdc02e7eb15a96f20ff48470d9869ec82d59..97cbd228dd33333468e545697530bbd1
     protected void randomizeAttributes(RandomSource random) {
         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue((double)generateMaxHealth(random::nextInt));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-index fbcd47e656a8d33da08d1d852a959bc7cf3a2394..5d960b40ff2c41e7e21cace33a2655eb8bea7dc9 100644
+index 9dbfefa7311d4c0f6805fce24429bec2739c6c49..80a7bc90fb4040afd2f7f0b19f5f6dbb6f9d13e8 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-@@ -94,6 +94,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
-         return generateSpeed(this.level.purpurConfig.llamaMovementSpeedMin, this.level.purpurConfig.llamaMovementSpeedMax);
+@@ -138,6 +138,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
     }
+     // Purpur end
 
 +    @Override
 +    public int getPurpurBreedTime() {
@@ -413,12 +413,12 @@ index fbcd47e656a8d33da08d1d852a959bc7cf3a2394..5d960b40ff2c41e7e21cace33a2655eb
         return false;
     }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
-index c3d58f503e940b123c26f20acd0527209b9df5f2..b219f5003379280d812acadd5a9ed93dde27ff8b 100644
+index 885e5aceacab0a2451d156418c35e4a7d5949aba..8b02a2a3620adf5af5ccbf93eda3c7d04f242b30 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
-@@ -29,6 +29,11 @@ public class Mule extends AbstractChestedHorse {
-         return generateSpeed(this.level.purpurConfig.muleMovementSpeedMin, this.level.purpurConfig.muleMovementSpeedMax);
+@@ -36,6 +36,11 @@ public class Mule extends AbstractChestedHorse {
     }
+     // Purpur end
 
 +    @Override
 +    public int getPurpurBreedTime() {
@@ -429,12 +429,12 @@ index c3d58f503e940b123c26f20acd0527209b9df5f2..b219f5003379280d812acadd5a9ed93d
     protected SoundEvent getAmbientSound() {
         return SoundEvents.MULE_AMBIENT;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
-index 5fa0c86940e46ac29ffc6427c1e8780299b50d73..ef97b87b6c385888f96e6e9dbb949d0d8977bc78 100644
+index 2be73b5fd5fe89f256e7fa0265cb7e4555ffe4b9..614bec5831a51e92f8201d0ce53ceb9b81fdc078 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
-@@ -43,6 +43,11 @@ public class SkeletonHorse extends AbstractHorse {
-         return generateSpeed(this.level.purpurConfig.skeletonHorseMovementSpeedMin, this.level.purpurConfig.skeletonHorseMovementSpeedMax);
+@@ -50,6 +50,11 @@ public class SkeletonHorse extends AbstractHorse {
     }
+     // Purpur end
 
 +    @Override
 +    public int getPurpurBreedTime() {
@@ -445,12 +445,12 @@ index 5fa0c86940e46ac29ffc6427c1e8780299b50d73..ef97b87b6c385888f96e6e9dbb949d0d
         return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0D).add(Attributes.MOVEMENT_SPEED, (double)0.2F);
     }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java b/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
-index 4e20863b7655d6c940ca42ab97f96617babfb11a..55b64ac786696736058c5f4314c7fb075c05bba3 100644
+index 6e6b1ec68c71b53f4e5e7b927511a2c147559821..3751a1c46d615000fdb5eaff482601575e81d614 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/TraderLlama.java
-@@ -42,6 +42,11 @@ public class TraderLlama extends Llama {
-         return generateSpeed(this.level.purpurConfig.traderLlamaMovementSpeedMin, this.level.purpurConfig.traderLlamaMovementSpeedMax);
+@@ -64,6 +64,11 @@ public class TraderLlama extends Llama {
     }
+     // Purpur end
 
 +    @Override
 +    public int getPurpurBreedTime() {
@@ -461,12 +461,12 @@ index 4e20863b7655d6c940ca42ab97f96617babfb11a..55b64ac786696736058c5f4314c7fb07
     public boolean isTraderLlama() {
         return true;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
-index 59962c79b7bc999beee493f013bfddc905b582b9..f3f4c559f19de41f1102dde13dbb554218219e9f 100644
+index 2243d71b5274d7dd53a15ed67f0b58e7467b9533..423d0ec37fe812fd994edb81c445f24543461ec4 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
-@@ -36,6 +36,11 @@ public class ZombieHorse extends AbstractHorse {
-         return generateSpeed(this.level.purpurConfig.zombieHorseMovementSpeedMin, this.level.purpurConfig.zombieHorseMovementSpeedMax);
+@@ -48,6 +48,11 @@ public class ZombieHorse extends AbstractHorse {
     }
+     // Purpur end
 
 +    @Override
 +    public int getPurpurBreedTime() {
@@ -477,12 +477,12 @@ index 59962c79b7bc999beee493f013bfddc905b582b9..f3f4c559f19de41f1102dde13dbb5542
         return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0D).add(Attributes.MOVEMENT_SPEED, (double)0.2F);
     }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-index bb6adbf3230866411c7e7581c77eebd085084abd..fdc158726cf6abfce68dd850709602b9bb70b12f 100644
+index 343b0ea4bceddc4c299a18d06071a70fe06546b9..ffc30f77549f669a9ddd930fd19b38afa6d52818 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-@@ -95,6 +95,11 @@ public class Sniffer extends Animal {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.snifferMaxHealth);
+@@ -112,6 +112,11 @@ public class Sniffer extends Animal {
     }
+     // Purpur end
 
 +    @Override
 +    public int getPurpurBreedTime() {
@@ -493,12 +493,12 @@ index bb6adbf3230866411c7e7581c77eebd085084abd..fdc158726cf6abfce68dd850709602b9
     @Override
     protected void defineSynchedData() {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Strider.java b/src/main/java/net/minecraft/world/entity/monster/Strider.java
-index bf44fc59eb4f2d18c728a7c24fd8b5c518208f09..3479e37415a1d5a94a1e2388bd56558b6d56eec9 100644
+index abefdf6679a4e15ccec4b67147d85bfc6271ac4b..dded8bde49978c01c2534d448adc17812a2c4474 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
-@@ -105,6 +105,11 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.striderMaxHealth);
+@@ -122,6 +122,11 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
     }
+     // Purpur end
 
 +    @Override
 +    public int getPurpurBreedTime() {
@@ -509,12 +509,12 @@ index bf44fc59eb4f2d18c728a7c24fd8b5c518208f09..3479e37415a1d5a94a1e2388bd56558b
         BlockPos.MutableBlockPos blockposition_mutableblockposition = pos.mutable();
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-index 139c0853d54f736d61ae8c2f90c8bef9e4acb164..467ea5292a5dca5679b0e9b92b75447c3770fae0 100644
+index 419377b795f88a8ab67e048e78292a1387ca13e1..35f7f7c75c740760f95eeaef91287a6a0ec3c3cc 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-@@ -72,6 +72,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
-         this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.hoglinMaxHealth);
+@@ -89,6 +89,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
     }
+     // Purpur end
 
 +    @Override
 +    public int getPurpurBreedTime() {
@@ -525,7 +525,7 @@ index 139c0853d54f736d61ae8c2f90c8bef9e4acb164..467ea5292a5dca5679b0e9b92b75447c
     public boolean canBeLeashed(Player player) {
         return !this.isLeashed();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 0780e76f12cd36744e5682860cf399634d4d137c..82222e74b3fd450b3c8c3d8b04a7243c7baba475 100644
+index 1e1cfe78113742ea865ca56d5bbf01483d2e0a2c..0eda8243f19af580e6ca20bf1583e0f4d6c5504f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -480,8 +480,10 @@ public class PurpurWorldConfig {
--- a/patches/server/0102-Apply-display-names-from-item-forms-of-entities-to-e.patch
+++ b/patches/server/0102-Apply-display-names-from-item-forms-of-entities-to-e.patch
@@ -136,7 +136,7 @@ index b2ad6d230de2c29f371178bccde1111c7532ee70..6667926519a0f1c151e53f59cce36e74
 
             if (((HangingEntity) object).survives()) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 82222e74b3fd450b3c8c3d8b04a7243c7baba475..cd37b4e5705ccbb88bf9fd8559c66e4ed7f092f0 100644
+index 0eda8243f19af580e6ca20bf1583e0f4d6c5504f..e703800b22ec6f8859504605564a9b2f06dd51c3 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -99,8 +99,10 @@ public class PurpurWorldConfig {
--- a/patches/server/0103-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
+++ b/patches/server/0103-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
@@ -17,7 +17,7 @@ index 2941c16ef486345b57ab2dfcd26f0272285d3b5a..a312bdc5c90cdcc45b40fc54a1a2a98f
                     ((Mob) newEntityLiving).setPersistenceRequired();
                     // Paper end
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index cd37b4e5705ccbb88bf9fd8559c66e4ed7f092f0..ceb42382e3f80c795d75ba2a34a4bed741d84ea7 100644
+index e703800b22ec6f8859504605564a9b2f06dd51c3..6369804009951ed9efb15d9c2d4f74d5810850f9 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -100,9 +100,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0104-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
+++ b/patches/server/0104-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
@@ -8,10 +8,10 @@ This should help to reduce the amount of dirt, gravel, grass, and etc.
 that Endermen like to randomly place all over the world.

 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 1bb0f20e964d74e9949fe7ec3034d5ada8bafa89..c3c32a99d53eea7f61b70d7ed8ddc8a2112dd9f7 100644
+index ba7d9d2b6927dd20e82009d57d77f713ab9be8ab..094ed658eaedcd88461330de0816e29b7db8acd2 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-@@ -464,7 +464,7 @@ public class EnderMan extends Monster implements NeutralMob {
+@@ -484,7 +484,7 @@ public class EnderMan extends Monster implements NeutralMob {
 
     @Override
     public boolean requiresCustomPersistence() {
@@ -21,7 +21,7 @@ index 1bb0f20e964d74e9949fe7ec3034d5ada8bafa89..c3c32a99d53eea7f61b70d7ed8ddc8a2
 
     private static class EndermanFreezeWhenLookedAt extends Goal {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ceb42382e3f80c795d75ba2a34a4bed741d84ea7..94c3fd880ac8a5561a9af57485810ed428cd718c 100644
+index 6369804009951ed9efb15d9c2d4f74d5810850f9..07ca764cd3436f2da79e9b8c7bb370f61d1a854f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -717,6 +717,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0105-Add-configurable-snowball-damage.patch
+++ b/patches/server/0105-Add-configurable-snowball-damage.patch
@@ -18,7 +18,7 @@ index 718e120c9768cf716b32d3d652f53f1dda925168..e1e19a360be99b189dee1652e5289292
     }
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 94c3fd880ac8a5561a9af57485810ed428cd718c..b23ef63f21eec2224975e7ee531e4c7d4becfdd5 100644
+index 07ca764cd3436f2da79e9b8c7bb370f61d1a854f..abb4fb180bc16441e294f77a3b8a1b9d5543061f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -356,6 +356,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0106-Changeable-Mob-Left-Handed-Chance.patch
+++ b/patches/server/0106-Changeable-Mob-Left-Handed-Chance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Changeable Mob Left Handed Chance


 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 0509b57efe9a42bf44a8ff2c13a042bb2d3accf9..311927443aaca5f3acd5936d333abc72719448d1 100644
+index 0101b6e0df2a6651a22c84d0fae4ebfb37f8e682..4fbc1fa9d3d37129b2ef243b65844dce9fe44884 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1289,7 +1289,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -18,7 +18,7 @@ index 0509b57efe9a42bf44a8ff2c13a042bb2d3accf9..311927443aaca5f3acd5936d333abc72
         } else {
             this.setLeftHanded(false);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index b23ef63f21eec2224975e7ee531e4c7d4becfdd5..eacc769e0930f3b510f70b4c5cf5024d1d249d40 100644
+index abb4fb180bc16441e294f77a3b8a1b9d5543061f..cdbf53d7c249d418d5958372b81ab9e7b3236925 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -158,8 +158,10 @@ public class PurpurWorldConfig {
--- a/patches/server/0107-Add-boat-fall-damage-config.patch
+++ b/patches/server/0107-Add-boat-fall-damage-config.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add boat fall damage config


 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 5165f6d8189ec8e64cdb0902d61276571198f9a7..2a0e5c8ef89bf32411893b4ee4a045ddc104dc93 100644
+index 375a6a12cabfdc798792166a60e3b18e8cbd7480..8c1a2fafd2e53720a524c1b84bb95f3865d029f9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1103,7 +1103,16 @@ public class ServerPlayer extends Player {
+@@ -1112,7 +1112,16 @@ public class ServerPlayer extends Player {
         if (this.isInvulnerableTo(source)) {
             return false;
         } else {
@@ -27,7 +27,7 @@ index 5165f6d8189ec8e64cdb0902d61276571198f9a7..2a0e5c8ef89bf32411893b4ee4a045dd
 
             if (!flag && isSpawnInvulnerable() && !source.is(DamageTypeTags.BYPASSES_INVULNERABILITY)) { // Purpur
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index eacc769e0930f3b510f70b4c5cf5024d1d249d40..f4443840cc77feb3cc6a6519d91d66a757d756af 100644
+index cdbf53d7c249d418d5958372b81ab9e7b3236925..0fb351aabd461ca77badd2099978c1095e0af220 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -114,6 +114,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0108-Snow-Golem-rate-of-fire-config.patch
+++ b/patches/server/0108-Snow-Golem-rate-of-fire-config.patch
@@ -10,20 +10,20 @@ If min-shoot-interval-ticks and max-shoot-interval-ticks are both set to
 0, snow golems won't shoot any snowballs.

 diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index 02e0f6d86a7dfc7a21a45bc8f50fed22a81207f2..ca557bf95c8238c6b671900affc1965b3f3af837 100644
+index d4d843ee7fe52a97dc1dd063c7437f6a6b05b9de..f43c37505e9e7c171b62cfc0621e425f5726dc3d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-@@ -61,7 +61,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
- 
+@@ -79,7 +79,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
     @Override
     protected void registerGoals() {
+         this.goalSelector.addGoal(0, new org.purpurmc.purpur.entity.ai.HasRider(this)); // Purpur
 -        this.goalSelector.addGoal(1, new RangedAttackGoal(this, 1.25D, 20, 10.0F));
 +        this.goalSelector.addGoal(1, new RangedAttackGoal(this, level.purpurConfig.snowGolemAttackDistance, level.purpurConfig.snowGolemSnowBallMin, level.purpurConfig.snowGolemSnowBallMax, level.purpurConfig.snowGolemSnowBallModifier)); // Purpur
         this.goalSelector.addGoal(2, new WaterAvoidingRandomStrollGoal(this, 1.0D, 1.0000001E-5F));
         this.goalSelector.addGoal(3, new LookAtPlayerGoal(this, Player.class, 6.0F));
         this.goalSelector.addGoal(4, new RandomLookAroundGoal(this));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index f4443840cc77feb3cc6a6519d91d66a757d756af..ac11e65b03fb94afad7fca5c10884c1859c5d23b 100644
+index 0fb351aabd461ca77badd2099978c1095e0af220..3e7226737f786399c06b80d72f2b0b7ec5bbd8e6 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1263,6 +1263,10 @@ public class PurpurWorldConfig {
--- a/Show More
+++ b/Show More