Updated Upstream (Paper & Tuinity)

Upstream has released updates that appear to apply and compile correctly Paper Changes: d985976 Add config for mobs immune to default effects (#4835) Tuinity Changes: ea43797 Fix portalling from the overworld above y 255
2026-02-17 08:27:43 +01:00 · 2021-07-10 11:22:51 -05:00
parent 325d6c39a4
commit 162d05fa3c
179 changed files with 209 additions and 247 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT
 mcVersion = 1.17.1
 packageVersion = 1_17_R1

-paperCommit = 871f30038e07e9d290f706724f3b3bb0423942e0
+paperCommit = d985976b3e152f21f5b11b8edbc265a80c07c202

 org.gradle.parallel = true
 org.gradle.vfs.watch = false
--- a/patches/server/0001-Tuinity-Server-Changes.patch
+++ b/patches/server/0001-Tuinity-Server-Changes.patch
@@ -7028,7 +7028,7 @@ index 0000000000000000000000000000000000000000..d2c7d2c7920324d7207225ed19484e80
 +}
 diff --git a/src/main/java/com/tuinity/tuinity/util/PoiAccess.java b/src/main/java/com/tuinity/tuinity/util/PoiAccess.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..e99583529a2cbdf8b764be3dff4373ec0ffaecd7
+index 0000000000000000000000000000000000000000..a7ae9f0f4e56138465b0d8913d3cea9d5e9b56f2
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/util/PoiAccess.java
@@ -0,0 +1,748 @@
@@ -7199,7 +7199,7 @@ index 0000000000000000000000000000000000000000..e99583529a2cbdf8b764be3dff4373ec
 +        final int upperZ = Mth.floor(sourcePosition.getZ() + range) >> 4;
 +
 +        final int centerX = sourcePosition.getX() >> 4;
-+        final int centerY = sourcePosition.getY() >> 4;
+        final int centerY = Mth.clamp(sourcePosition.getY() >> 4, lowerY, upperY);
 +        final int centerZ = sourcePosition.getZ() >> 4;
 +
 +        final LongArrayFIFOQueue queue = new LongArrayFIFOQueue();
@@ -7441,7 +7441,7 @@ index 0000000000000000000000000000000000000000..e99583529a2cbdf8b764be3dff4373ec
 +        final int upperZ = Mth.floor(sourcePosition.getZ() + range) >> 4;
 +
 +        final int centerX = sourcePosition.getX() >> 4;
-+        final int centerY = sourcePosition.getY() >> 4;
+        final int centerY = Mth.clamp(sourcePosition.getY() >> 4, lowerY, upperY);
 +        final int centerZ = sourcePosition.getZ() >> 4;
 +
 +        final LongArrayFIFOQueue queue = new LongArrayFIFOQueue();
--- a/patches/server/0056-Add-wither-skeleton-takes-wither-damage-option.patch
+++ b/patches/server/0056-Add-wither-skeleton-takes-wither-damage-option.patch
@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Tue, 14 Jan 2020 19:43:40 -0600
-Subject: [PATCH] Add wither skeleton takes wither damage option
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
-index 8212ee2cc1242c0a3626f3643c455f3be0de18c2..aaf6f43c0f37a51a7b2db57b8da4336530664afe 100644
--- a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
-@@ -139,6 +139,6 @@ public class WitherSkeleton extends AbstractSkeleton {
- 
-     @Override
-     public boolean canBeAffected(MobEffectInstance effect) {
-        return effect.getEffect() == MobEffects.WITHER ? false : super.canBeAffected(effect);
-+        return (level.purpurConfig.witherSkeletonTakesWitherDamage || effect.getEffect() != MobEffects.WITHER) && super.canBeAffected(effect); // Purpur
-     }
- }
-diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c612eaaef7072e6d737b52bcb9dc425e5af6154c..b72963171098778793b4f12fe37deb8b271db4b7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1306,6 +1306,7 @@ public class PurpurWorldConfig {
-     public boolean witherSkeletonRidable = false;
-     public boolean witherSkeletonRidableInWater = false;
-     public double witherSkeletonMaxHealth = 20.0D;
-+    public boolean witherSkeletonTakesWitherDamage = false;
-     private void witherSkeletonSettings() {
-         witherSkeletonRidable = getBoolean("mobs.wither_skeleton.ridable", witherSkeletonRidable);
-         witherSkeletonRidableInWater = getBoolean("mobs.wither_skeleton.ridable-in-water", witherSkeletonRidableInWater);
-@@ -1315,6 +1316,7 @@ public class PurpurWorldConfig {
-             set("mobs.wither_skeleton.attributes.max_health", oldValue);
-         }
-         witherSkeletonMaxHealth = getDouble("mobs.wither_skeleton.attributes.max_health", witherSkeletonMaxHealth);
-+        witherSkeletonTakesWitherDamage = getBoolean("mobs.wither_skeleton.takes-wither-damage", witherSkeletonTakesWitherDamage);
-     }
- 
-     public boolean wolfRidable = false;
--- a/patches/server/0056-Configurable-TPS-Catchup.patch
+++ b/patches/server/0056-Configurable-TPS-Catchup.patch
--- a/patches/server/0057-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
+++ b/patches/server/0057-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
@@ -18,7 +18,7 @@ index c95eef8596fe3e1ca83e620a6c54b164c797cbe1..1e6a5404d767318de29184b3e3a2bc41
                 if (!this.level.isClientSide && this.pickup == AbstractArrow.Pickup.ALLOWED) {
                     this.spawnAtLocation(this.getPickupItem(), 0.1F);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b72963171098778793b4f12fe37deb8b271db4b7..187aa9977951171fb75be176ef8f4a9eb19686ff 100644
+index c612eaaef7072e6d737b52bcb9dc425e5af6154c..f390aec2afc030a7de92b5be1c21ee751ea686f7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -203,9 +203,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0058-Add-enderman-and-creeper-griefing-controls.patch
+++ b/patches/server/0058-Add-enderman-and-creeper-griefing-controls.patch
@@ -38,7 +38,7 @@ index b061ecc42122ef66fbf87fe017023abca5728a01..6e0b5fbf5b0d216b6b7c647d45ef37cd
         }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 187aa9977951171fb75be176ef8f4a9eb19686ff..20cafa733409f3fe404f9705fcfd8e79ca00c4f5 100644
+index f390aec2afc030a7de92b5be1c21ee751ea686f7..b1f0d9f958fa414fff40725575f852af42c83161 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -375,6 +375,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0059-Villagers-follow-emerald-blocks.patch
+++ b/patches/server/0059-Villagers-follow-emerald-blocks.patch
@@ -17,7 +17,7 @@ index e59a77c80a1bbe62aaa61bd4792d21b12c895a5c..44e9d6d0b80203b152957efef953c2fa
     // 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 ed96780ededea9ae98bc0fb60d250587e6bc9854..9e13eda42c781b6f95b63d58d775bb22cbd87a96 100644
+index 311b6c0ff37ce217af9391b50208fdc63e3fe420..44831fb0697ba949ccbf8024f0a35867425e190c 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -171,6 +171,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -41,7 +41,7 @@ index d2588a91b55aebdecf8e1644498111ccf84a9dc9..393061e13375bf7a7ee57973b4abac83
         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/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 20cafa733409f3fe404f9705fcfd8e79ca00c4f5..9f1156d4e16b85167a14438fcce007600be21660 100644
+index b1f0d9f958fa414fff40725575f852af42c83161..2894dad132d9ede51314dc035975a208af711012 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1234,6 +1234,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0060-Allow-leashing-villagers.patch
+++ b/patches/server/0060-Allow-leashing-villagers.patch
@@ -17,7 +17,7 @@ index 2a310cb6cc1bfbf0c8d65c96b6bdbe8450d7c3ce..6848b8a21a4ad3e7dc4cfdb4a73045bf
             // Paper start - drop leash variable
             org.bukkit.event.player.PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(this, player, !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 9e13eda42c781b6f95b63d58d775bb22cbd87a96..e903fe670e50ff34187994d36a2d875d5f51bdb6 100644
+index 44831fb0697ba949ccbf8024f0a35867425e190c..0c6583751e75d175338aaf411fb26baa1946a9b4 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -178,6 +178,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -49,7 +49,7 @@ index 393061e13375bf7a7ee57973b4abac83ffa15fa3..c48935d35a6141c41db22e3ec172d599
 
     @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 9f1156d4e16b85167a14438fcce007600be21660..11e0a19bbf1c4ed88e95e15aa82b12a6d601ebed 100644
+index 2894dad132d9ede51314dc035975a208af711012..f6edfcd18ee077525554978bc2600e95cc0b66c2 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1235,6 +1235,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0061-Implement-configurable-search-radius-for-villagers-t.patch
+++ b/patches/server/0061-Implement-configurable-search-radius-for-villagers-t.patch
@@ -18,7 +18,7 @@ index 0c6583751e75d175338aaf411fb26baa1946a9b4..bad3b9eb0ab8612f9c80c52caff38ffe
 
         for (int i = 0; i < 10; ++i) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 11e0a19bbf1c4ed88e95e15aa82b12a6d601ebed..6b5b2f30f7c5dc38b6e190f45f29ab5578b9a8c4 100644
+index f6edfcd18ee077525554978bc2600e95cc0b66c2..9509cbc44413353c621a1469a320a7a4e531c1c8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1236,6 +1236,8 @@ public class PurpurWorldConfig {
--- a/patches/server/0062-Implement-infinite-lava.patch
+++ b/patches/server/0062-Implement-infinite-lava.patch
@@ -58,7 +58,7 @@ index 695783e64564b1d2a178d57a89737d2a97ab9014..cd1a33a1f10d04a91358f51d736bda34
     protected boolean canConvertToSource() {
         return false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6b5b2f30f7c5dc38b6e190f45f29ab5578b9a8c4..ca60ae312600ea01308659f333d9c8e7ed3de0b3 100644
+index 9509cbc44413353c621a1469a320a7a4e531c1c8..e16e4d59d51bfd7c5dbffe690c0d4d4064e4130a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -215,6 +215,13 @@ public class PurpurWorldConfig {
--- a/patches/server/0063-Make-lava-flow-speed-configurable.patch
+++ b/patches/server/0063-Make-lava-flow-speed-configurable.patch
@@ -18,7 +18,7 @@ index cd1a33a1f10d04a91358f51d736bda34110324c4..b0d671ba015d1ad37fdf600b8e70def2
 
     @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ca60ae312600ea01308659f333d9c8e7ed3de0b3..0c02205712c7fbc8fe584b99dbc37ce023e09a3c 100644
+index e16e4d59d51bfd7c5dbffe690c0d4d4064e4130a..da467704ad57edb2baa0471a483efd709ba44724 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -217,9 +217,13 @@ public class PurpurWorldConfig {
--- a/patches/server/0064-Add-player-death-exp-control-options.patch
+++ b/patches/server/0064-Add-player-death-exp-control-options.patch
@@ -31,7 +31,7 @@ index d6b610a848f37db24af9b219be2f22aeaf892388..52d43c2bf1fa1bfa97aab02a9837c6b1
             return 0;
         }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0c02205712c7fbc8fe584b99dbc37ce023e09a3c..de7efcad4d0db0d14f60ce76f0ee2d1cdbb77e11 100644
+index da467704ad57edb2baa0471a483efd709ba44724..6985134eacf932b349a3a436ea7a14268314a8ea 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -166,6 +166,8 @@ public class PurpurWorldConfig {
--- a/patches/server/0065-Configurable-void-damage-height-and-damage.patch
+++ b/patches/server/0065-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 8197ad7db6ec1a750b732e597af75f41ab056778..b4d0df32fb9e8357ee87c779ff1228fb4f0009f5 100644
+index 46b6e0fcf662472b7fcccc33f859c5e33340d7bb..5a23bc98f38e715ee16abe9a370b044e928b2d03 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -767,7 +767,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -18,7 +18,7 @@ index 8197ad7db6ec1a750b732e597af75f41ab056778..b4d0df32fb9e8357ee87c779ff1228fb
             && this.getY() >= this.level.paperConfig.netherVoidTopDamageHeight)) {
             // 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 df6e71ee5b151b0b319defb4b9fd10858ff03bbd..5e9040f72bea00d1011ebb0936ca2e26e42a44bb 100644
+index 31f3767c7d9e9fc5f3bd91c7ec163bce8ada64db..8f550154b12521662889bbc91f5cd8e20523a90f 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2388,7 +2388,7 @@ public abstract class LivingEntity extends Entity {
@@ -31,7 +31,7 @@ index df6e71ee5b151b0b319defb4b9fd10858ff03bbd..5e9040f72bea00d1011ebb0936ca2e26
 
     protected void updateSwingTime() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index de7efcad4d0db0d14f60ce76f0ee2d1cdbb77e11..622a73529972ff9906e0fdea43c43ee3d123f418 100644
+index 6985134eacf932b349a3a436ea7a14268314a8ea..5a74d39198c03771aaf810e20fb47ca6f352bbd0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -208,10 +208,14 @@ public class PurpurWorldConfig {
--- a/patches/server/0066-Add-canSaveToDisk-to-Entity.patch
+++ b/patches/server/0066-Add-canSaveToDisk-to-Entity.patch
@@ -19,7 +19,7 @@ index 5a23bc98f38e715ee16abe9a370b044e928b2d03..6db330cf388ef80f3acb84e41f02063c
     // Purpur end
 }
 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 2f33897a74ff2bd629b4ffacc4a1e1e0cd6b7987..4527fdd2c2001767c225574e1610ddfaa7bb4f34 100644
+index f52420f27f51d9dbf214f96a0530c0f17f2bc5fc..12cd1b453150e098975c34e00ec9277ff9730c75 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
@@ -192,6 +192,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
--- a/patches/server/0067-Dispenser-curse-of-binding-protection.patch
+++ b/patches/server/0067-Dispenser-curse-of-binding-protection.patch
@@ -43,7 +43,7 @@ index aab4a63e61aced51b1b6c885fd8b8426a4f14408..ad095c6bc7e00d286c83e37f84d8ed5d
             // CraftBukkit start
             Level world = pointer.getLevel();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 622a73529972ff9906e0fdea43c43ee3d123f418..af4bf306c118fa109b8745e7ac8a0bcaa38a0fbc 100644
+index 5a74d39198c03771aaf810e20fb47ca6f352bbd0..ce5b48ce8bd412a11ccc5428cfdee0b152570fd9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -218,6 +218,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0068-Add-option-for-boats-to-eject-players-on-land.patch
+++ b/patches/server/0068-Add-option-for-boats-to-eject-players-on-land.patch
@@ -17,7 +17,7 @@ index aa7c022c4faade23bd9061311d4152cf845d3331..d4a19fc38027717e43353bc62ef23e56
             } else {
                 return Boat.Status.IN_AIR;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index af4bf306c118fa109b8745e7ac8a0bcaa38a0fbc..be285a9c50893a8bb0a305eb7dde4953b81be768 100644
+index ce5b48ce8bd412a11ccc5428cfdee0b152570fd9..fd49391f0050e5943e51dc69deec174082518868 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -205,12 +205,14 @@ public class PurpurWorldConfig {
--- a/patches/server/0069-Mending-mends-most-damages-equipment-first.patch
+++ b/patches/server/0069-Mending-mends-most-damages-equipment-first.patch
@@ -73,7 +73,7 @@ index d439e8ce87bf7da03683a336941c7673b8b166e4..955e482e4bc83f2b777cd2e4254c40be
         Entry<EquipmentSlot, ItemStack> entry = getRandomItemWith(enchantment, entityliving);
         return entry != null ? entry.getValue() : ItemStack.EMPTY;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index be285a9c50893a8bb0a305eb7dde4953b81be768..580871c876a4b115968856c9d99b0442778f8063 100644
+index fd49391f0050e5943e51dc69deec174082518868..1a74ed951699b71af64caa087bb5375caba82051 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -205,6 +205,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0070-Add-5-second-tps-average-in-tps.patch
+++ b/patches/server/0070-Add-5-second-tps-average-in-tps.patch
--- a/patches/server/0071-Implement-elytra-settings.patch
+++ b/patches/server/0071-Implement-elytra-settings.patch
@@ -5,7 +5,7 @@ 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 5e9040f72bea00d1011ebb0936ca2e26e42a44bb..adca4ca2d13612503d36776ea4998cba9b038c10 100644
+index 8f550154b12521662889bbc91f5cd8e20523a90f..f1a8b91f620152a3da3c11769c3c2353ccdba3cf 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3284,7 +3284,16 @@ public abstract class LivingEntity extends Entity {
@@ -99,7 +99,7 @@ index 510ed67a7de2b503ab8b01db57ed09ee33b0d825..3f53dc8f250ad3f7616ce7ef0a2353ca
                         entityhuman.startAutoSpinAttack(20);
                         if (entityhuman.isOnGround()) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 580871c876a4b115968856c9d99b0442778f8063..6b5f7f895a9e53582bd2dee373b8b2eb1899e2da 100644
+index 1a74ed951699b71af64caa087bb5375caba82051..217de624c94e6cc6f6ede013e281cdbf28d63338 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -97,6 +97,19 @@ public class PurpurWorldConfig {
--- a/patches/server/0072-Item-entity-immunities.patch
+++ b/patches/server/0072-Item-entity-immunities.patch
@@ -94,7 +94,7 @@ index 158719d46c96bb733a00e08c8285f41a48406abf..5201e59c7ce9e92790c185279ba69d7f
 +    // Purpur end
 }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6b5f7f895a9e53582bd2dee373b8b2eb1899e2da..180d1c9a552b6d96dd7a30f991bb375c299e4ddb 100644
+index 217de624c94e6cc6f6ede013e281cdbf28d63338..98e42d551427a6fa8c8ed59e3191be4dd162db01 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -110,6 +110,49 @@ public class PurpurWorldConfig {
--- a/patches/server/0073-Add-ping-command.patch
+++ b/patches/server/0073-Add-ping-command.patch
@@ -17,7 +17,7 @@ index d478627dcd2b6e3d3d95b3fa224a25d44e6bbafb..158fc5748f175708a0c3415a2217663f
 
         if (environment.includeIntegrated) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index db9c33cc36099fb6b203a5526b6399ca3a067d83..ce6ae54b8739d699b756bb8b46180cebd6fe353e 100644
+index 0ae18dfbd6ea05737cd456762da32efe3a51aef8..a8c969b1a88df7f4c3cbee4df1d8f581ae2a549d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -160,12 +160,14 @@ public class PurpurConfig {
--- a/patches/server/0074-Add-demo-command.patch
+++ b/patches/server/0074-Add-demo-command.patch
@@ -17,7 +17,7 @@ index 158fc5748f175708a0c3415a2217663f77271bc7..9cbaaf4cd138e6c1d2d51afcef24a81a
         }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index ce6ae54b8739d699b756bb8b46180cebd6fe353e..e831b4dbf5dd702acc531a2ca7ee7068dff91408 100644
+index a8c969b1a88df7f4c3cbee4df1d8f581ae2a549d..5bd68aed7f5d31bbdc057e4b63026b37061a7983 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -160,6 +160,7 @@ public class PurpurConfig {
--- a/patches/server/0075-Add-credits-command.patch
+++ b/patches/server/0075-Add-credits-command.patch
@@ -17,7 +17,7 @@ index 9cbaaf4cd138e6c1d2d51afcef24a81a3f2973c5..f164106a957c24bdb71bde85d82948a6
             net.pl3x.purpur.command.PingCommand.register(this.dispatcher); // Purpur
         }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index e831b4dbf5dd702acc531a2ca7ee7068dff91408..fa58d301da334cf901b7c2d4a747ef6da96db69d 100644
+index 5bd68aed7f5d31bbdc057e4b63026b37061a7983..d7f43f4be2e38febb9ff7b67a319316c40929416 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -160,6 +160,7 @@ public class PurpurConfig {
--- a/patches/server/0076-Configurable-jockey-options.patch
+++ b/patches/server/0076-Configurable-jockey-options.patch
@@ -167,7 +167,7 @@ index 8464026df1b46ad30301fed4944aa1d3cd39bd9e..5b5958e37918b97fa994500fe94cd0e5
 
     @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 180d1c9a552b6d96dd7a30f991bb375c299e4ddb..2dd3b0701cacd4948690a5cc7f79cb0ddbc89d99 100644
+index 98e42d551427a6fa8c8ed59e3191be4dd162db01..38f07a1ca300bd78baeec8bbe50cae2f73359762 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -519,6 +519,9 @@ public class PurpurWorldConfig {
@@ -210,7 +210,7 @@ index 180d1c9a552b6d96dd7a30f991bb375c299e4ddb..2dd3b0701cacd4948690a5cc7f79cb0d
     }
 
     public boolean illusionerRidable = false;
-@@ -1453,6 +1465,9 @@ public class PurpurWorldConfig {
+@@ -1451,6 +1463,9 @@ public class PurpurWorldConfig {
     public boolean zombieRidableInWater = false;
     public double zombieMaxHealth = 20.0D;
     public double zombieSpawnReinforcements = 0.1D;
@@ -220,7 +220,7 @@ index 180d1c9a552b6d96dd7a30f991bb375c299e4ddb..2dd3b0701cacd4948690a5cc7f79cb0d
     private void zombieSettings() {
         zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
         zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -1463,6 +1478,9 @@ public class PurpurWorldConfig {
+@@ -1461,6 +1476,9 @@ public class PurpurWorldConfig {
         }
         zombieMaxHealth = getDouble("mobs.zombie.attributes.max_health", zombieMaxHealth);
         zombieSpawnReinforcements = getDouble("mobs.zombie.attributes.spawn_reinforcements", zombieSpawnReinforcements);
@@ -230,7 +230,7 @@ index 180d1c9a552b6d96dd7a30f991bb375c299e4ddb..2dd3b0701cacd4948690a5cc7f79cb0d
     }
 
     public boolean zombieHorseRidableInWater = false;
-@@ -1496,6 +1514,9 @@ public class PurpurWorldConfig {
+@@ -1494,6 +1512,9 @@ public class PurpurWorldConfig {
     public boolean zombieVillagerRidableInWater = false;
     public double zombieVillagerMaxHealth = 20.0D;
     public double zombieVillagerSpawnReinforcements = 0.1D;
@@ -240,7 +240,7 @@ index 180d1c9a552b6d96dd7a30f991bb375c299e4ddb..2dd3b0701cacd4948690a5cc7f79cb0d
     private void zombieVillagerSettings() {
         zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
         zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
-@@ -1506,12 +1527,18 @@ public class PurpurWorldConfig {
+@@ -1504,12 +1525,18 @@ public class PurpurWorldConfig {
         }
         zombieVillagerMaxHealth = getDouble("mobs.zombie_villager.attributes.max_health", zombieVillagerMaxHealth);
         zombieVillagerSpawnReinforcements = getDouble("mobs.zombie_villager.attributes.spawn_reinforcements", zombieVillagerSpawnReinforcements);
@@ -259,7 +259,7 @@ index 180d1c9a552b6d96dd7a30f991bb375c299e4ddb..2dd3b0701cacd4948690a5cc7f79cb0d
     private void zombifiedPiglinSettings() {
         zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
         zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
-@@ -1522,5 +1549,8 @@ public class PurpurWorldConfig {
+@@ -1520,5 +1547,8 @@ public class PurpurWorldConfig {
         }
         zombifiedPiglinMaxHealth = getDouble("mobs.zombified_piglin.attributes.max_health", zombifiedPiglinMaxHealth);
         zombifiedPiglinSpawnReinforcements = getDouble("mobs.zombified_piglin.attributes.spawn_reinforcements", zombifiedPiglinSpawnReinforcements);
--- a/patches/server/0077-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
+++ b/patches/server/0077-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
@@ -258,7 +258,7 @@ index 5e069ac0c57d2a3a23f6e4483d12ce298d172691..916c29d08fbcf245ad6f50f8e8cc1736
 
         private float speed = 0.1F;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2dd3b0701cacd4948690a5cc7f79cb0ddbc89d99..99a7d9e598678a7deeff694b5e050b72a40a9fe8 100644
+index 38f07a1ca300bd78baeec8bbe50cae2f73359762..9e57a48a53e5435ef358749482174f1bb9aff7a2 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -932,6 +932,9 @@ public class PurpurWorldConfig {
--- a/patches/server/0078-Add-phantom-spawning-options.patch
+++ b/patches/server/0078-Add-phantom-spawning-options.patch
@@ -48,7 +48,7 @@ index 79504dc3448402e73b09c4232b1fd0488872cf68..300c9f136edace2babea4a574090b184
                                             for (int l = 0; l < k; ++l) {
                                                 // Paper start
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 99a7d9e598678a7deeff694b5e050b72a40a9fe8..05a24c0fc9330359aaff8052f0066cc4ddd14191 100644
+index 9e57a48a53e5435ef358749482174f1bb9aff7a2..8e0b9b3117c0d88fe5988d7fe1b7c5bb5be7d28e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -935,6 +935,18 @@ public class PurpurWorldConfig {
--- a/patches/server/0079-Implement-bed-explosion-options.patch
+++ b/patches/server/0079-Implement-bed-explosion-options.patch
@@ -27,7 +27,7 @@ index 163a7861f987c3832aac51cc6df950c768546731..bf5765b6af9c7807d50f7daaacb5d524
             }
         }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 05a24c0fc9330359aaff8052f0066cc4ddd14191..2bd7dea57c0e0005be2b4fbe98de10fd167186a6 100644
+index 8e0b9b3117c0d88fe5988d7fe1b7c5bb5be7d28e..9759d5ba2d7bf0ccc86b7a109ae115952031371c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -278,6 +278,22 @@ public class PurpurWorldConfig {
--- a/patches/server/0080-Implement-respawn-anchor-explosion-options.patch
+++ b/patches/server/0080-Implement-respawn-anchor-explosion-options.patch
@@ -18,7 +18,7 @@ index af4eb4a8814491afef449a2874521636957d7557..365c28300ecfbe0161716972adf22a8a
 
     public static boolean canSetSpawn(Level world) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2bd7dea57c0e0005be2b4fbe98de10fd167186a6..e7c816cbb0817239a1575a2328af23e32352e5a5 100644
+index 9759d5ba2d7bf0ccc86b7a109ae115952031371c..e96302393e76bbd20fe4245d978ae1a6086b5164 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -315,6 +315,22 @@ public class PurpurWorldConfig {
--- a/patches/server/0081-Add-allow-water-in-end-world-option.patch
+++ b/patches/server/0081-Add-allow-water-in-end-world-option.patch
--- a/patches/server/0082-Allow-color-codes-in-books.patch
+++ b/patches/server/0082-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 c19b708cd7c6ec18ea44a5afa3b7e1c4ac4ddcb6..c1f322910d66c6d7961b33840a761a2e8f7a0424 100644
+index 0be0d27e2534fccf0f8ff828476e2a0612c60d71..a1687fe41480048a1d98fda8c5b704d874c47708 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1200,13 +1200,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
--- a/patches/server/0083-Entity-lifespan.patch
+++ b/patches/server/0083-Entity-lifespan.patch
@@ -89,7 +89,7 @@ index f7c915ababdacd0901787d6dd1c08accacadabe5..df79f95ab2c8b9106cac889787b840b1
     }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e7c816cbb0817239a1575a2328af23e32352e5a5..5040f2c1ac73888fe3334742e096a237d1ae1ebb 100644
+index e96302393e76bbd20fe4245d978ae1a6086b5164..41678daa4765aa01ec91cdbe554fc1dd7316e292 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -110,6 +110,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0084-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
+++ b/patches/server/0084-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
@@ -35,7 +35,7 @@ index 116fdc97069071c84912f2b9b045d0e22c1b6ba3..39493db2f716fe165431d9f8b3566c07
 +    // 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 cb1ed54aa49a93fff15a0d72d459fd7adc037f6c..a9767676a2e84984374cc7d7d012477c60be5a7f 100644
+index f1a8b91f620152a3da3c11769c3c2353ccdba3cf..0c14ccc74abcc68ecc5422b38bc729dc659b9b8b 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -45,6 +45,7 @@ import net.minecraft.network.syncher.EntityDataAccessor;
@@ -55,7 +55,7 @@ index cb1ed54aa49a93fff15a0d72d459fd7adc037f6c..a9767676a2e84984374cc7d7d012477c
                     }
                 }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 5040f2c1ac73888fe3334742e096a237d1ae1ebb..b9e6082a7f15b83a6121684177516a4f0478d5a6 100644
+index 41678daa4765aa01ec91cdbe554fc1dd7316e292..6d453f43651cec45bb0099d8fa8ee14bd20b3de9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -229,6 +229,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0085-Squid-EAR-immunity.patch
+++ b/patches/server/0085-Squid-EAR-immunity.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Squid EAR immunity


 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b9e6082a7f15b83a6121684177516a4f0478d5a6..50de6f8b6a18ddd330ae1bb6ba8f58b73e17d7da 100644
+index 6d453f43651cec45bb0099d8fa8ee14bd20b3de9..378eda35a9f60412f36007320b7a86457dd95846 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1268,6 +1268,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0086-Configurable-feature-seed-settings.patch
+++ b/patches/server/0086-Configurable-feature-seed-settings.patch
--- a/patches/server/0087-Phantoms-burn-in-light.patch
+++ b/patches/server/0087-Phantoms-burn-in-light.patch
@@ -47,7 +47,7 @@ index 916c29d08fbcf245ad6f50f8e8cc173677b01081..c55aba456aa144e58fc35877c61eff30
                     list.sort(Comparator.<Player, Double>comparing(Entity::getY).reversed()); // Paper - remap fix
                     Iterator iterator = list.iterator();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 50de6f8b6a18ddd330ae1bb6ba8f58b73e17d7da..58b0b17167a5248acc9f0ebfac2d357f49688d79 100644
+index 378eda35a9f60412f36007320b7a86457dd95846..e74ea145d561b4cfef3310061dbc38a7252637ea 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -986,6 +986,9 @@ public class PurpurWorldConfig {
--- a/patches/server/0088-Configurable-villager-breeding.patch
+++ b/patches/server/0088-Configurable-villager-breeding.patch
@@ -5,7 +5,7 @@ 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 3865f16e027307f5b8b2a5617b66ffd8b9f85c60..bb3572370a86519a92b7b3dab0482cd1527de19d 100644
+index bad3b9eb0ab8612f9c80c52caff38ffe791d112c..4752205ab570ab8f6ae7f0a15ae610b603ade2ea 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -751,7 +751,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -18,7 +18,7 @@ index 3865f16e027307f5b8b2a5617b66ffd8b9f85c60..bb3572370a86519a92b7b3dab0482cd1
 
     private boolean hungry() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 58b0b17167a5248acc9f0ebfac2d357f49688d79..2a8435b39afc16d3ca862d17bb40fe3cc9d5e494 100644
+index e74ea145d561b4cfef3310061dbc38a7252637ea..d9412405c5eaee5c342ecbbf481f695d3fa308b0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1411,6 +1411,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0089-Redstone-deactivates-spawners.patch
+++ b/patches/server/0089-Redstone-deactivates-spawners.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Redstone deactivates spawners


 diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
-index 9228c0bc797fb95c8ac949bdc568eadafee84a80..f2c9f841d397f445cd3d0420f19e765c28e5598d 100644
+index c601b8b12756682a4cb300be8ebed4319902c5b5..eec88d3947d435559d8ce175f72c5efb02d25826 100644
 --- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
@@ -78,6 +78,7 @@ public abstract class BaseSpawner {
@@ -17,7 +17,7 @@ index 9228c0bc797fb95c8ac949bdc568eadafee84a80..f2c9f841d397f445cd3d0420f19e765c
     }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2a8435b39afc16d3ca862d17bb40fe3cc9d5e494..584757245d2703e69659746c3d382af456cb3f89 100644
+index d9412405c5eaee5c342ecbbf481f695d3fa308b0..7687900ab8a057f5b8c88ab24b05094b4407fede 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -345,6 +345,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0090-Totems-work-in-inventory.patch
+++ b/patches/server/0090-Totems-work-in-inventory.patch
@@ -5,7 +5,7 @@ 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 a9767676a2e84984374cc7d7d012477c60be5a7f..3bda2f895612cb5bfd6205a675c03edc6a2270d6 100644
+index 0c14ccc74abcc68ecc5422b38bc729dc659b9b8b..b909eeba0539ab133e274a15b0b479b5546fc903 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1516,6 +1516,19 @@ public abstract class LivingEntity extends Entity {
@@ -29,7 +29,7 @@ index a9767676a2e84984374cc7d7d012477c60be5a7f..3bda2f895612cb5bfd6205a675c03edc
             event.setCancelled(itemstack == null);
             this.level.getCraftServer().getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 584757245d2703e69659746c3d382af456cb3f89..31ccb922343d971f8669147abffa97547df54e4d 100644
+index 7687900ab8a057f5b8c88ab24b05094b4407fede..c0a8bd071cfd87d1c156e1c1a6866357cc3e107c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -230,6 +230,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0091-Add-vindicator-johnny-spawn-chance.patch
+++ b/patches/server/0091-Add-vindicator-johnny-spawn-chance.patch
@@ -30,7 +30,7 @@ index 76e6ea34db3942e9dd7646ad7ca1259f4387a4d8..9096c40ad5784d9097e889f0f43b6cf1
     }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 31ccb922343d971f8669147abffa97547df54e4d..e28c5973ec4642fc729bcfa47aabade4afed4765 100644
+index c0a8bd071cfd87d1c156e1c1a6866357cc3e107c..8a5b7b852fc29d049c13160bd97b4f16176b1a11 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1440,6 +1440,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0092-Add-option-to-disable-certain-block-updates.patch
+++ b/patches/server/0092-Add-option-to-disable-certain-block-updates.patch
@@ -117,7 +117,7 @@ index f8e58d9f71703139a736d93e7f1996e027a29444..d3c8fd8399629efb8bcbaf7d9a0c4334
     }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 44286c661943cb147372b7864709485e747545c1..96dc811c655672e6fdb23865d63b564331ec7d88 100644
+index 4e928dd1efdd7e1f71a5c5adb3a287eb0463e077..23d1352ae9d740ab02c5020802ef56a3a11cf832 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -346,6 +346,15 @@ public class PurpurConfig {
--- a/patches/server/0093-Dispensers-place-anvils-option.patch
+++ b/patches/server/0093-Dispensers-place-anvils-option.patch
@@ -41,7 +41,7 @@ index 92623ae25249d63efb92be8bd6c95228f9155ad2..20bf6d01046488eff53a109f5239351a
 
     static void setEntityPokingOutOfBlock(BlockSource pointer, Entity entity, Direction direction) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e28c5973ec4642fc729bcfa47aabade4afed4765..cce72e2574486fb178caa3bc1a89cbf39d66e4d1 100644
+index 8a5b7b852fc29d049c13160bd97b4f16176b1a11..9cd23e80ddf1cda60e1c342c11025145846b11f3 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -304,8 +304,10 @@ public class PurpurWorldConfig {
--- a/patches/server/0094-Allow-anvil-colors.patch
+++ b/patches/server/0094-Allow-anvil-colors.patch
@@ -37,7 +37,7 @@ index ddfb89d62d2ec316683e9f0f5550e298ab26d137..410ac71efff92dfa1f1e11895d0f5bf3
             }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index cce72e2574486fb178caa3bc1a89cbf39d66e4d1..f2e4cd773a3a3145d7a67245e23534fc77fadb72 100644
+index 9cd23e80ddf1cda60e1c342c11025145846b11f3..d051f003711a61f194e848ccf4f476de0ac5ec49 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -287,6 +287,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0095-Add-no-random-tick-block-list.patch
+++ b/patches/server/0095-Add-no-random-tick-block-list.patch
@@ -35,7 +35,7 @@ index 7538262e14c86e4da9cd4cb887b76f649bfef2e6..f34973be478de4f088a0593b45bd89e5
         }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f2e4cd773a3a3145d7a67245e23534fc77fadb72..b2c28f97ceb6c8c18332a56f9d2042dc9301ce3e 100644
+index d051f003711a61f194e848ccf4f476de0ac5ec49..e53c175340aa8bcab04a75348c29cef6209ba285 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -287,6 +287,28 @@ public class PurpurWorldConfig {
--- a/patches/server/0096-Add-option-to-disable-dolphin-treasure-searching.patch
+++ b/patches/server/0096-Add-option-to-disable-dolphin-treasure-searching.patch
@@ -17,7 +17,7 @@ index c372d47a929e06c8cfb0df86cf4e9bfee4d4b300..2aead13e8f879b614445715fb1912a20
         }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b2c28f97ceb6c8c18332a56f9d2042dc9301ce3e..d46484ca99fac9751db3ab8cae430f7167733a2e 100644
+index e53c175340aa8bcab04a75348c29cef6209ba285..b12f3a1a88033af6e041549064b50d24493c53eb 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -553,6 +553,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0097-Short-enderman-height.patch
+++ b/patches/server/0097-Short-enderman-height.patch
@@ -31,7 +31,7 @@ index 6e0b5fbf5b0d216b6b7c647d45ef37cd6b591717..5ebedd6a156b06e98aded57c817f6342
             if (this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start
             for (int i = 0; i < 64; ++i) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 96dc811c655672e6fdb23865d63b564331ec7d88..c283926d05fa60c576b8018bcaee465a03a699a5 100644
+index 23d1352ae9d740ab02c5020802ef56a3a11cf832..f1b349454cb78e5e49061bf26fc2f801802a5526 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -336,6 +336,12 @@ public class PurpurConfig {
--- a/patches/server/0098-Stop-squids-floating-on-top-of-water.patch
+++ b/patches/server/0098-Stop-squids-floating-on-top-of-water.patch
@@ -5,7 +5,7 @@ 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 d4f1984fcf965cb5b9bb9f2e10d790286d25c613..3d947ba3719d494f202f28c5d93d28944a6860c9 100644
+index 6db330cf388ef80f3acb84e41f02063c36f9aaf2..c5a1e46cc01e0f296a02536e70dc1443bb23a26f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3829,11 +3829,17 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -60,7 +60,7 @@ index 6f7e6429c35eea346517cbf08cf223fc6d838a8c..6a77112180556675af38cb1b3ce0b38a
 +    // Purpur
 }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d46484ca99fac9751db3ab8cae430f7167733a2e..298b246a383100a9860afad156ed9e9219d61bf6 100644
+index b12f3a1a88033af6e041549064b50d24493c53eb..5fcfb4867cb60295b2100c5179deeefcc6adaf54 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1313,6 +1313,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0099-Use-configured-height-for-nether-surface-builders.patch
+++ b/patches/server/0099-Use-configured-height-for-nether-surface-builders.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use configured height for nether surface builders


 diff --git a/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherCappedSurfaceBuilder.java b/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherCappedSurfaceBuilder.java
-index 7c3386b37aae7d10629e0a256102967f69b68a7e..0cfb34557eb52988681868ad772ca3b113ef5dc2 100644
+index cdfbdb411eacf5f8c6ced2dbc5789e0d49b93e1f..e4013f241a5e9aeb334dadde8b55c7e6ca32233c 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherCappedSurfaceBuilder.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/surfacebuilders/NetherCappedSurfaceBuilder.java
@@ -40,7 +40,7 @@ public abstract class NetherCappedSurfaceBuilder extends SurfaceBuilder<SurfaceB
--- a/patches/server/0100-Crying-obsidian-valid-for-portal-frames.patch
+++ b/patches/server/0100-Crying-obsidian-valid-for-portal-frames.patch
@@ -18,7 +18,7 @@ index c07b5d1f1ef8b5e6026c7555d476880c8802d6c5..068f1b184a3694603f564d49fa45d5ce
     private final LevelAccessor level;
     private final Direction.Axis axis;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index c283926d05fa60c576b8018bcaee465a03a699a5..380bb11ea7cabd9513397dec5eb171f4269418bb 100644
+index f1b349454cb78e5e49061bf26fc2f801802a5526..ab10cade5e290fc479f7a6b5905a639bc24ef596 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -320,6 +320,7 @@ public class PurpurConfig {
--- a/patches/server/0101-Entities-can-use-portals-configuration.patch
+++ b/patches/server/0101-Entities-can-use-portals-configuration.patch
@@ -5,7 +5,7 @@ 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 3d947ba3719d494f202f28c5d93d28944a6860c9..721fd382ac1a024fea3360c100f5f7ad665e73bb 100644
+index c5a1e46cc01e0f296a02536e70dc1443bb23a26f..63ab08c00048feba74e4b3c25308ee75d2aa8474 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2701,7 +2701,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -27,7 +27,7 @@ index 3d947ba3719d494f202f28c5d93d28944a6860c9..721fd382ac1a024fea3360c100f5f7ad
 
     public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 298b246a383100a9860afad156ed9e9219d61bf6..8d5090df3fbd40a514751c72897689d2023310a2 100644
+index 5fcfb4867cb60295b2100c5179deeefcc6adaf54..0d33e68749a8e16036f38ac830247ce09bb1d6ac 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -273,6 +273,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0102-LivingEntity-broadcastItemBreak.patch
+++ b/patches/server/0102-LivingEntity-broadcastItemBreak.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak


 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 3e4ad876fa34d0e509fe6331767d31068c4ddb20..23c136ed6daf5111b97996053df18413480532e5 100644
+index 00c56b7c2d2d34029144ef953aedd085183a5928..e0acfc315f80d9a5c5aa045845ccc3e00c4435c5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -883,5 +883,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
--- a/patches/server/0103-Customizable-wither-health-and-healing.patch
+++ b/patches/server/0103-Customizable-wither-health-and-healing.patch
@@ -6,7 +6,7 @@ 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 4527fdd2c2001767c225574e1610ddfaa7bb4f34..5f24fb3fc4ffb2e032cf755d984716d1c3a3e965 100644
+index 12cd1b453150e098975c34e00ec9277ff9730c75..ee13bdfb5cfc9992d26126804c0a0bb512c2eb1e 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
@@ -504,8 +504,10 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -23,7 +23,7 @@ index 4527fdd2c2001767c225574e1610ddfaa7bb4f34..5f24fb3fc4ffb2e032cf755d984716d1
 
             this.bossEvent.setProgress(this.getHealth() / this.getMaxHealth());
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8d5090df3fbd40a514751c72897689d2023310a2..ae8fb1abb64b2f2d5a6580ad5e708072576da1a5 100644
+index 0d33e68749a8e16036f38ac830247ce09bb1d6ac..48bf586acd5968819bdbbf8f224bb1dc9b47a8f5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1524,6 +1524,8 @@ public class PurpurWorldConfig {
--- a/patches/server/0104-Allow-toggling-special-MobSpawners-per-world.patch
+++ b/patches/server/0104-Allow-toggling-special-MobSpawners-per-world.patch
@@ -94,7 +94,7 @@ index f8ede3588bfda9a7d4d5807311a3e9c2651fd0a3..56967cef0f184def046935e20148574f
             if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, world, blockposition2, EntityType.WANDERING_TRADER)) {
                 blockposition1 = blockposition2;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ae8fb1abb64b2f2d5a6580ad5e708072576da1a5..db422ed3d1691c48ddcf06cec0cdb9be7ae91d75 100644
+index 48bf586acd5968819bdbbf8f224bb1dc9b47a8f5..8c41d2b2729593a807efb5a9d10b13e9f7dcbd28 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -71,6 +71,12 @@ public class PurpurWorldConfig {
--- a/patches/server/0105-Raid-cooldown-setting.patch
+++ b/patches/server/0105-Raid-cooldown-setting.patch
@@ -52,7 +52,7 @@ index 45e369aa69a6b78def42b619b1b1b8259d4b30ea..de7443e7a27e51eabaed2d6d348ec8ea
                     if (!this.raidMap.containsKey(raid.getId())) {
                         this.raidMap.put(raid.getId(), raid);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index db422ed3d1691c48ddcf06cec0cdb9be7ae91d75..5c8e25590e99e7db547ef415f4cab34c200021e9 100644
+index 8c41d2b2729593a807efb5a9d10b13e9f7dcbd28..ad656e046e199510528eb2a51d004d438915ebef 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -299,6 +299,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0106-Despawn-rate-config-options-per-projectile-type.patch
+++ b/patches/server/0106-Despawn-rate-config-options-per-projectile-type.patch
@@ -289,7 +289,7 @@ index 4a11f7417b438ee5711a720aca3321c88e970b2a..46b74271ce5f614f07754db14d2a552c
 +    // Purpur end
 }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 5c8e25590e99e7db547ef415f4cab34c200021e9..d207aa7ae9ece4959831f9e7c606b16a55e6b76f 100644
+index ad656e046e199510528eb2a51d004d438915ebef..8a7b456397d278b61a8ef1f21aad498bf0afe64c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -266,6 +266,35 @@ public class PurpurWorldConfig {
--- a/patches/server/0107-Add-option-to-disable-zombie-aggressiveness-towards-.patch
+++ b/patches/server/0107-Add-option-to-disable-zombie-aggressiveness-towards-.patch
@@ -71,10 +71,10 @@ index f6e33ca1933792a3a417f54d20fea8dc4a41c1b5..7eed6c176345c766a99d4304d61d2835
         this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
     }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d207aa7ae9ece4959831f9e7c606b16a55e6b76f..050f2d8325d8b5a18e534027662fcbfff06a4c68 100644
+index 8a7b456397d278b61a8ef1f21aad498bf0afe64c..f6ae1959d600fe6955e8d9a72cde2df4d229a2cc 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1647,6 +1647,7 @@ public class PurpurWorldConfig {
+@@ -1645,6 +1645,7 @@ public class PurpurWorldConfig {
     public boolean zombieJockeyOnlyBaby = true;
     public double zombieJockeyChance = 0.05D;
     public boolean zombieJockeyTryExistingChickens = true;
@@ -82,7 +82,7 @@ index d207aa7ae9ece4959831f9e7c606b16a55e6b76f..050f2d8325d8b5a18e534027662fcbff
     private void zombieSettings() {
         zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
         zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -1660,6 +1661,7 @@ public class PurpurWorldConfig {
+@@ -1658,6 +1659,7 @@ public class PurpurWorldConfig {
         zombieJockeyOnlyBaby = getBoolean("mobs.zombie.jockey.only-babies", zombieJockeyOnlyBaby);
         zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
         zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
--- a/patches/server/0108-Persistent-TileEntity-Lore-and-DisplayName.patch
+++ b/patches/server/0108-Persistent-TileEntity-Lore-and-DisplayName.patch
@@ -189,7 +189,7 @@ index c3a07ccccd5cc38552363c82398f432c8d624288..132c9e6a643995d9fde535a78d9edc9e
 +    // Purpur end
 }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 050f2d8325d8b5a18e534027662fcbfff06a4c68..2086377305f800980d436b606c72ddba447694f1 100644
+index f6ae1959d600fe6955e8d9a72cde2df4d229a2cc..821a9103156dc8d3ea498af394bc414016c5eced 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -325,6 +325,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0109-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
+++ b/patches/server/0109-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
--- a/patches/server/0110-Flying-squids-Oh-my.patch
+++ b/patches/server/0110-Flying-squids-Oh-my.patch
@@ -58,7 +58,7 @@ index 2affff346a7fe81480e86cb61996039df0569853..12be4a2f25a7def8341acda47d10a256
                 float f1 = Mth.cos(f) * 0.2F;
                 float f2 = -0.1F + this.squid.getRandom().nextFloat() * 0.2F;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2086377305f800980d436b606c72ddba447694f1..f9da36aa9aead8f8ec7ec33469a1d95009e3a297 100644
+index 821a9103156dc8d3ea498af394bc414016c5eced..212c5bded10587ee7cca5c9bc89e7f355b485b13 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -812,9 +812,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0111-Infinity-bow-settings.patch
+++ b/patches/server/0111-Infinity-bow-settings.patch
@@ -27,7 +27,7 @@ index afe33f20578177cb517e1c116e6319481642e66c..fe4695adbb506733b4029ecfabcfda3d
         } else {
             user.startUsingItem(hand);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f9da36aa9aead8f8ec7ec33469a1d95009e3a297..d5799c1084095eda3d3fd2d5bd2ae307ddad996b 100644
+index 212c5bded10587ee7cca5c9bc89e7f355b485b13..0821a3b8a4a8d36ed31f44c58d305cf7f37a0c19 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -121,6 +121,17 @@ public class PurpurWorldConfig {
--- a/patches/server/0112-Stonecutter-damage.patch
+++ b/patches/server/0112-Stonecutter-damage.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Stonecutter damage


 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 721fd382ac1a024fea3360c100f5f7ad665e73bb..260a2d8616030c0f5619eb357719b980f93570c8 100644
+index 63ab08c00048feba74e4b3c25308ee75d2aa8474..ad691bd5c17ef7a8ecb394d620e02b28ac08f5a4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1001,7 +1001,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -61,7 +61,7 @@ index 2ad5ff9a1d7de54e75436e99da8a73db9dc91bde..60605a8a021cc56f9c3ba22bc43c43c3
             } else if (blockState.is(Blocks.HONEY_BLOCK)) {
                 return BlockPathTypes.STICKY_HONEY;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d5799c1084095eda3d3fd2d5bd2ae307ddad996b..21d3acb8a69fffd372af6cd1fc667feb91a3a4dc 100644
+index 0821a3b8a4a8d36ed31f44c58d305cf7f37a0c19..6fc344bacb5943971a49e5ae6ceb22443525eeb1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -448,6 +448,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0113-Configurable-daylight-cycle.patch
+++ b/patches/server/0113-Configurable-daylight-cycle.patch
@@ -70,7 +70,7 @@ index 98af132fd4a03afb016a05fd004ffe3e1d5cd957..f15da84c0e5f9ab67c4d9ec59ee37de3
 
     public void tickCustomSpawners(boolean spawnMonsters, boolean spawnAnimals) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 21d3acb8a69fffd372af6cd1fc667feb91a3a4dc..a2e9ed180930e3f20b4973f2082d4b336e2719a1 100644
+index 6fc344bacb5943971a49e5ae6ceb22443525eeb1..0d924990f60019c6a6b9d1ac37e176af43cae93c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -103,6 +103,13 @@ public class PurpurWorldConfig {
--- a/patches/server/0114-Allow-infinite-and-mending-enchantments-together.patch
+++ b/patches/server/0114-Allow-infinite-and-mending-enchantments-together.patch
@@ -17,7 +17,7 @@ index 3aece8245060dd1ba269c08d226c84247a6f0a83..6763d0b96c83d1b462999f525bf1f31c
     }
 }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 380bb11ea7cabd9513397dec5eb171f4269418bb..1d9fa061b0a109296a1bcc7d06a7786ddc76d1b9 100644
+index ab10cade5e290fc479f7a6b5905a639bc24ef596..e17c0c2dd3dc2f21cd039a37302e2c103efba2e0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -338,6 +338,16 @@ public class PurpurConfig {
--- a/patches/server/0115-Furnace-uses-lava-from-underneath.patch
+++ b/patches/server/0115-Furnace-uses-lava-from-underneath.patch
@@ -48,7 +48,7 @@ index 348e485897c34cca19113cc35f055a58778ca38b..fb3f7e821224889b08c0f424d79e122c
 
     private static boolean canBurn(@Nullable Recipe<?> recipe, NonNullList<ItemStack> slots, int count) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a2e9ed180930e3f20b4973f2082d4b336e2719a1..e2e7dafa46f16c8b3fcc68ff8a56b4183ca51e09 100644
+index 0d924990f60019c6a6b9d1ac37e176af43cae93c..47ef898f0581dceccd1d33c9b13bcb3908e17a3d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -416,6 +416,17 @@ public class PurpurWorldConfig {
--- a/patches/server/0116-Arrows-should-not-reset-despawn-counter.patch
+++ b/patches/server/0116-Arrows-should-not-reset-despawn-counter.patch
--- a/patches/server/0117-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
+++ b/patches/server/0117-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Ability to re-add farmland mechanics from Alpha


 diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-index e59861e0feb20b66735a76c19fd4e48bf13443e2..9fb0464f74bcbb757171290ae44f4a4c7ea4d499 100644
+index 5d9d77cb382c8075af2713a0ce26c28a35a0aaa8..2d4d59eb5a534e4c283933b734c44776b674b2eb 100644
 --- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
@@ -96,6 +96,14 @@ public class FarmBlock extends Block {
@@ -24,7 +24,7 @@ index e59861e0feb20b66735a76c19fd4e48bf13443e2..9fb0464f74bcbb757171290ae44f4a4c
                 return;
             }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e2e7dafa46f16c8b3fcc68ff8a56b4183ca51e09..5ba0878c35606d7b980105a3c4f12c7d885203d3 100644
+index 47ef898f0581dceccd1d33c9b13bcb3908e17a3d..61116813f0f798f8f90467541bf5cde55714a053 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -412,8 +412,10 @@ public class PurpurWorldConfig {
--- a/patches/server/0118-Add-adjustable-breeding-cooldown-to-config.patch
+++ b/patches/server/0118-Add-adjustable-breeding-cooldown-to-config.patch
@@ -95,7 +95,7 @@ index e52a708904d7c7d8d19e9def3bc915a9141c2bed..42c9952ee868fa54d9b6f2db8e08e3bc
         this.world = new CraftWorld((ServerLevel) this, gen, env);
         this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 5ba0878c35606d7b980105a3c4f12c7d885203d3..f7a73173585239c90ae55f49eed3cd40e0f8e1e8 100644
+index 61116813f0f798f8f90467541bf5cde55714a053..914d3a6ac675d9b2e348af281db22768cc5ee616 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -348,6 +348,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0119-Make-entity-breeding-times-configurable.patch
+++ b/patches/server/0119-Make-entity-breeding-times-configurable.patch
@@ -266,7 +266,7 @@ index 497be3182c72b5a0f3bc42088c4168702119b527..607823661ba942ec03b1f61dac5a786b
 
     @Override
 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 31568adcf4a89b11e61f455a15326c7f72bf487e..c1202540383ef991d7b8c3767132c4fc54d4c570 100644
+index 66c01b8300bc09ace27e4d1a30ee9274c69fcc9a..3e8c90c2d44d906fae3dfc068a30c81a494a3268 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
@@ -105,6 +105,11 @@ public class Turtle extends Animal {
@@ -474,7 +474,7 @@ index 5d289be8f0ef003abbce992e7662f6ddce4f4a99..5e3d7321a73144c3e4c43c18c5b748b2
 
     @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f7a73173585239c90ae55f49eed3cd40e0f8e1e8..a1e135e7813c31dbb0508ebb0bee1a2c453e5b4e 100644
+index 914d3a6ac675d9b2e348af281db22768cc5ee616..b86fdb60e693d3ad1016d10d3f3559daa81fab1b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -486,9 +486,11 @@ public class PurpurWorldConfig {
@@ -834,7 +834,7 @@ index f7a73173585239c90ae55f49eed3cd40e0f8e1e8..a1e135e7813c31dbb0508ebb0bee1a2c
     }
 
     public boolean vindicatorRidable = false;
-@@ -1659,6 +1705,7 @@ public class PurpurWorldConfig {
+@@ -1657,6 +1703,7 @@ public class PurpurWorldConfig {
     public boolean wolfRidable = false;
     public boolean wolfRidableInWater = false;
     public double wolfMaxHealth = 8.0D;
@@ -842,7 +842,7 @@ index f7a73173585239c90ae55f49eed3cd40e0f8e1e8..a1e135e7813c31dbb0508ebb0bee1a2c
     private void wolfSettings() {
         wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
         wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
-@@ -1668,6 +1715,7 @@ public class PurpurWorldConfig {
+@@ -1666,6 +1713,7 @@ public class PurpurWorldConfig {
             set("mobs.wolf.attributes.max_health", oldValue);
         }
         wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);
--- a/patches/server/0120-Apply-display-names-from-item-forms-of-entities-to-e.patch
+++ b/patches/server/0120-Apply-display-names-from-item-forms-of-entities-to-e.patch
@@ -142,7 +142,7 @@ index 282bfe4904637aaff1bd29e30ed18ba843c07cab..ddd50db8bb92c147d7c1eef4d1df3ac5
 
             if (((HangingEntity) object).survives()) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a1e135e7813c31dbb0508ebb0bee1a2c453e5b4e..396091bd1a72cac5cc07815f7ca1c68b5cec87c2 100644
+index b86fdb60e693d3ad1016d10d3f3559daa81fab1b..5f68883f98fb9f3b8db7944627607970619c2d6c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -99,8 +99,10 @@ public class PurpurWorldConfig {
--- a/patches/server/0121-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
+++ b/patches/server/0121-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
@@ -17,7 +17,7 @@ index 623f78c078fb3aa2665d7e8a37672438227bce6b..500c69e555c7247e20ef8cc59d834155
                     ((Mob) newEntityLiving).setPersistenceRequired();
                 // Paper end
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 396091bd1a72cac5cc07815f7ca1c68b5cec87c2..53d0ec1e89b05d798ebfc620ada0d95bcf61cb21 100644
+index 5f68883f98fb9f3b8db7944627607970619c2d6c..a2547df37f58b67776da9b5eeba73b0ca6acbc87 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -100,9 +100,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0122-Add-twisting-and-weeping-vines-growth-rates.patch
+++ b/patches/server/0122-Add-twisting-and-weeping-vines-growth-rates.patch
@@ -82,7 +82,7 @@ index 35b2bad76c45b5a94ba7f2e9c7a8cfeb8c3f498b..d2cb1a7e7ea364cb8e2af4c4e756d8e4
 +    // Purpur end
 }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 53d0ec1e89b05d798ebfc620ada0d95bcf61cb21..646fceecfe7c626d0a2cec671c1f12be743c7805 100644
+index a2547df37f58b67776da9b5eeba73b0ca6acbc87..06a639b5b20e4c1e4cef7263bae8d9e328342b55 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -412,6 +412,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0123-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
+++ b/patches/server/0123-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
@@ -103,7 +103,7 @@ index d2cb1a7e7ea364cb8e2af4c4e756d8e45bc0ca10..bb99dda3c5167f23b2500a1f37cbc1ca
     // Purpur end
 }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 646fceecfe7c626d0a2cec671c1f12be743c7805..3895f0f0f096adbefd806f60a86cd2ea40c288b7 100644
+index 06a639b5b20e4c1e4cef7263bae8d9e328342b55..d2699241f5c01e33e13ed2ceac9a828d3cf87f41 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -413,8 +413,10 @@ public class PurpurWorldConfig {
--- a/patches/server/0124-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
+++ b/patches/server/0124-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
@@ -21,7 +21,7 @@ index 5ebedd6a156b06e98aded57c817f63429a1ae380..c99d295b999a28dd1eb504179250445d
 
     private static class EndermanFreezeWhenLookedAt extends Goal {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 3895f0f0f096adbefd806f60a86cd2ea40c288b7..38cb6bb3f0f45a257614ce26c40ca6b259af626d 100644
+index d2699241f5c01e33e13ed2ceac9a828d3cf87f41..4d43cd955ba4e46a1149075591139a8ace262282 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -790,6 +790,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0125-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
+++ b/patches/server/0125-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
--- a/patches/server/0126-Add-configurable-snowball-damage.patch
+++ b/patches/server/0126-Add-configurable-snowball-damage.patch
@@ -18,7 +18,7 @@ index ed2f039c4042861bcfa2e41d8281eefd37daa9fa..d5d84893c77b4e60a19032d765d76bfd
     }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 38cb6bb3f0f45a257614ce26c40ca6b259af626d..0e30b578748c2c6f2231ec1a526cbfef9edabf9f 100644
+index 4d43cd955ba4e46a1149075591139a8ace262282..b49e7d4c21449ad6ccfe24c837fb7ea619b539b4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -288,6 +288,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0127-Zombie-break-door-minimum-difficulty-option.patch
+++ b/patches/server/0127-Zombie-break-door-minimum-difficulty-option.patch
@@ -44,10 +44,10 @@ index fe045f8e35fe2aac51032a67ce52b27a53a8eff0..03bc86c776596ca5964c22adb757115d
 +    // Purpur end
 }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0e30b578748c2c6f2231ec1a526cbfef9edabf9f..1000177563e5681a8caa745f1cd40af37723e8bc 100644
+index b49e7d4c21449ad6ccfe24c837fb7ea619b539b4..72592ed2f2fc83974b9adcff7406bb84a77ed62a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1779,6 +1779,7 @@ public class PurpurWorldConfig {
+@@ -1777,6 +1777,7 @@ public class PurpurWorldConfig {
     public double zombieJockeyChance = 0.05D;
     public boolean zombieJockeyTryExistingChickens = true;
     public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
@@ -55,7 +55,7 @@ index 0e30b578748c2c6f2231ec1a526cbfef9edabf9f..1000177563e5681a8caa745f1cd40af3
     private void zombieSettings() {
         zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
         zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -1793,6 +1794,11 @@ public class PurpurWorldConfig {
+@@ -1791,6 +1792,11 @@ public class PurpurWorldConfig {
         zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
         zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
         zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);
--- a/patches/server/0128-Left-handed-API.patch
+++ b/patches/server/0128-Left-handed-API.patch
--- a/patches/server/0129-Changeable-Mob-Left-Handed-Chance.patch
+++ b/patches/server/0129-Changeable-Mob-Left-Handed-Chance.patch
@@ -18,7 +18,7 @@ index df79f95ab2c8b9106cac889787b840b166ff0a9c..2f061e2825127e4a38e261ccacf56926
         } else {
             this.setLeftHanded(false);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 1000177563e5681a8caa745f1cd40af37723e8bc..27f9e9e65b7773190af12513085136709cf18d44 100644
+index 72592ed2f2fc83974b9adcff7406bb84a77ed62a..adf2d5b31a5e15cd0afb7bea2c9016f6857358e9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -128,8 +128,10 @@ public class PurpurWorldConfig {
--- a/patches/server/0130-Add-boat-fall-damage-config.patch
+++ b/patches/server/0130-Add-boat-fall-damage-config.patch
@@ -5,7 +5,7 @@ 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 4b74790581b0f629507e5d00c0882bad0f0e168e..85d2fda86638075130def6a47912682637186d84 100644
+index 39493db2f716fe165431d9f8b3566c07e3657c8d..b52cea07a77bd5124881e144483e148cbf5ad54d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -987,7 +987,16 @@ public class ServerPlayer extends Player {
@@ -27,7 +27,7 @@ index 4b74790581b0f629507e5d00c0882bad0f0e168e..85d2fda86638075130def6a479126826
 
             if (!flag && isSpawnInvulnerable() && source != DamageSource.OUT_OF_WORLD) { // Purpur
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 27f9e9e65b7773190af12513085136709cf18d44..89bb1405ca28456bc0bd0ad6b3828d39b33c0264 100644
+index adf2d5b31a5e15cd0afb7bea2c9016f6857358e9..6207b9accb2971d6ff8c69c9a665aa35b53ef0d9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -351,6 +351,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0131-Snow-Golem-rate-of-fire-config.patch
+++ b/patches/server/0131-Snow-Golem-rate-of-fire-config.patch
@@ -23,7 +23,7 @@ index 0733f9c057fef17fd79a4769f19b78f4c83a7784..1697b573ffd0c5d17d2d538c40f5ce4b
         this.goalSelector.addGoal(3, new LookAtPlayerGoal(this, Player.class, 6.0F));
         this.goalSelector.addGoal(4, new RandomLookAroundGoal(this));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 89bb1405ca28456bc0bd0ad6b3828d39b33c0264..09e9d82db853b865192d0c420b80b4dc784e6f46 100644
+index 6207b9accb2971d6ff8c69c9a665aa35b53ef0d9..42961f8d61204798ad4942dfa87d66d72eb62ae5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1473,6 +1473,10 @@ public class PurpurWorldConfig {
--- a/patches/server/0132-PaperPR-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0132-PaperPR-Config-option-for-Piglins-guarding-chests.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PaperPR - Config option for Piglins guarding chests


 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 26e18a08a7f0bd704ff3055ce3a7814191450c85..197756f89b7d4d0e20e2ba48ab42b0ac59ded47f 100644
+index b07368ed5b8fcacd617988d09d5d27904315cf27..11576c89a4d7a6a29b1d17a6126fcba8154a6a4b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -49,6 +49,11 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 26e18a08a7f0bd704ff3055ce3a7814191450c85..197756f89b7d4d0e20e2ba48ab42b0ac
     private void useEigencraftRedstone() {
         useEigencraftRedstone = this.getBoolean("use-faster-eigencraft-redstone", false);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
-index 7606254a83975f4052565efbf52d37df31b37bca..c8194aed379d97613b99a7c697110bbc333420ed 100644
+index 01d307e0022656509bc8fd02d6bac78a6af3a7be..2366735f571113a543fd15607b5ff74c09cd0d24 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
@@ -468,6 +468,7 @@ public class PiglinAi {
--- a/patches/server/0133-EMC-Configurable-disable-give-dropping.patch
+++ b/patches/server/0133-EMC-Configurable-disable-give-dropping.patch
@@ -20,7 +20,7 @@ index a0dc380e90415de9068ea408d62a1605c82631df..60fd566f7e1499ecf2ad91216a667f12
                         itemStack.setCount(1);
                         ItemEntity itemEntity2 = serverPlayer.drop(itemStack, false, false, true); // Paper - Fix duplicating /give items on item drop cancel
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 1d9fa061b0a109296a1bcc7d06a7786ddc76d1b9..9d2b3f57779b1bc9732636a4618ef58ce7f6f722 100644
+index e17c0c2dd3dc2f21cd039a37302e2c103efba2e0..00a5c65439a30499156a10b1822760fe48ee7776 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -317,6 +317,11 @@ public class PurpurConfig {
--- a/patches/server/0134-Lobotomize-stuck-villagers.patch
+++ b/patches/server/0134-Lobotomize-stuck-villagers.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Lobotomize stuck villagers


 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 bb3572370a86519a92b7b3dab0482cd1527de19d..9a460eeb48c14590d28d071cfa5a925157e837c5 100644
+index 4752205ab570ab8f6ae7f0a15ae610b603ade2ea..9ee0acdd5b3ce1eb5c78bd85c6732ad7f92655e2 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -142,6 +142,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -53,7 +53,7 @@ index bb3572370a86519a92b7b3dab0482cd1527de19d..9a460eeb48c14590d28d071cfa5a9251
         if (this.assignProfessionWhenSpawned) {
             this.assignProfessionWhenSpawned = false;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 09e9d82db853b865192d0c420b80b4dc784e6f46..58924239d28b1c0e5ae7d2ed719f617cb1eee184 100644
+index 42961f8d61204798ad4942dfa87d66d72eb62ae5..1ea67f92a3d3c09751df0f9e3b6a3cf64f2590e8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1646,6 +1646,8 @@ public class PurpurWorldConfig {
--- a/patches/server/0135-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
+++ b/patches/server/0135-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
@@ -185,7 +185,7 @@ index 901fc6520d58a5fa5f2cf1b4fa78fec6008aa409..9050cd25663c71197c597aac0ab2e612
     public static final VillagerProfession FISHERMAN = register("fisherman", PoiType.FISHERMAN, SoundEvents.VILLAGER_WORK_FISHERMAN);
     public static final VillagerProfession FLETCHER = register("fletcher", PoiType.FLETCHER, SoundEvents.VILLAGER_WORK_FLETCHER);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 58924239d28b1c0e5ae7d2ed719f617cb1eee184..92d76fa843c846906d8f54114d7d24df3e4050d9 100644
+index 1ea67f92a3d3c09751df0f9e3b6a3cf64f2590e8..5d043e559a190a70d6a3e53e00ad060a43bc37f9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1648,6 +1648,8 @@ public class PurpurWorldConfig {
--- a/patches/server/0136-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
+++ b/patches/server/0136-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
@@ -35,10 +35,10 @@ index 5b5958e37918b97fa994500fe94cd0e57faa1948..64216c9d76ce5ec6a845915ca078b0c0
         }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 92d76fa843c846906d8f54114d7d24df3e4050d9..cc12e27ebf60f92ce46c86055ee8559d0027ab3b 100644
+index 5d043e559a190a70d6a3e53e00ad060a43bc37f9..faa45f7be455fcc101523b452fc09ea9f42cfa51 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1882,6 +1882,7 @@ public class PurpurWorldConfig {
+@@ -1880,6 +1880,7 @@ public class PurpurWorldConfig {
     public boolean zombifiedPiglinJockeyOnlyBaby = true;
     public double zombifiedPiglinJockeyChance = 0.05D;
     public boolean zombifiedPiglinJockeyTryExistingChickens = true;
@@ -46,7 +46,7 @@ index 92d76fa843c846906d8f54114d7d24df3e4050d9..cc12e27ebf60f92ce46c86055ee8559d
     private void zombifiedPiglinSettings() {
         zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
         zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
-@@ -1895,5 +1896,6 @@ public class PurpurWorldConfig {
+@@ -1893,5 +1894,6 @@ public class PurpurWorldConfig {
         zombifiedPiglinJockeyOnlyBaby = getBoolean("mobs.zombified_piglin.jockey.only-babies", zombifiedPiglinJockeyOnlyBaby);
         zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance);
         zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);
--- a/patches/server/0137-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
+++ b/patches/server/0137-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
--- a/patches/server/0138-Configurable-chance-for-wolves-to-spawn-rabid.patch
+++ b/patches/server/0138-Configurable-chance-for-wolves-to-spawn-rabid.patch
@@ -201,10 +201,10 @@ index ef4abaf68de01b0879f7d0b330d2d57cc6bd10f9..3e7409ebf1f94b9cf55f2d0b0fe17ca8
             return super.mobInteract(player, hand);
         }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index cc12e27ebf60f92ce46c86055ee8559d0027ab3b..5c189d221dddd9e550770418361e7a5965d7ddf7 100644
+index faa45f7be455fcc101523b452fc09ea9f42cfa51..43376091a2596af66772e5a3a967d945d5b8a32b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1769,6 +1769,8 @@ public class PurpurWorldConfig {
+@@ -1767,6 +1767,8 @@ public class PurpurWorldConfig {
     public boolean wolfRidable = false;
     public boolean wolfRidableInWater = false;
     public double wolfMaxHealth = 8.0D;
@@ -213,7 +213,7 @@ index cc12e27ebf60f92ce46c86055ee8559d0027ab3b..5c189d221dddd9e550770418361e7a59
     public int wolfBreedingTicks = 6000;
     private void wolfSettings() {
         wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
-@@ -1779,6 +1781,8 @@ public class PurpurWorldConfig {
+@@ -1777,6 +1779,8 @@ public class PurpurWorldConfig {
             set("mobs.wolf.attributes.max_health", oldValue);
         }
         wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);
--- a/patches/server/0139-Configurable-default-wolf-collar-color.patch
+++ b/patches/server/0139-Configurable-default-wolf-collar-color.patch
@@ -24,10 +24,10 @@ index 3e7409ebf1f94b9cf55f2d0b0fe17ca8ec44659f..518dd0e6b4889c049e438b393baa795a
 
     @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 5c189d221dddd9e550770418361e7a5965d7ddf7..ca7596a6531dbc9ac0e1769764518e7e9d7eeeec 100644
+index 43376091a2596af66772e5a3a967d945d5b8a32b..294c83b75d43132b58421e927e5359e874158b42 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1769,6 +1769,7 @@ public class PurpurWorldConfig {
+@@ -1767,6 +1767,7 @@ public class PurpurWorldConfig {
     public boolean wolfRidable = false;
     public boolean wolfRidableInWater = false;
     public double wolfMaxHealth = 8.0D;
@@ -35,7 +35,7 @@ index 5c189d221dddd9e550770418361e7a5965d7ddf7..ca7596a6531dbc9ac0e1769764518e7e
     public boolean wolfMilkCuresRabies = true;
     public double wolfNaturalRabid = 0.0D;
     public int wolfBreedingTicks = 6000;
-@@ -1781,6 +1782,11 @@ public class PurpurWorldConfig {
+@@ -1779,6 +1780,11 @@ public class PurpurWorldConfig {
             set("mobs.wolf.attributes.max_health", oldValue);
         }
         wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);
--- a/patches/server/0140-Phantom-flames-on-swoop.patch
+++ b/patches/server/0140-Phantom-flames-on-swoop.patch
@@ -17,7 +17,7 @@ index c55aba456aa144e58fc35877c61eff309eaa391f..c39e2d05fa81279a684532ee796880b1
 
     @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ca7596a6531dbc9ac0e1769764518e7e9d7eeeec..e44328d3ac04512e79f1b1363e72bf5e82426782 100644
+index 294c83b75d43132b58421e927e5359e874158b42..316b0499c49924771d1361e35f3a4d2ce46a739b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1177,6 +1177,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0141-Option-for-chests-to-open-even-with-a-solid-block-on.patch
+++ b/patches/server/0141-Option-for-chests-to-open-even-with-a-solid-block-on.patch
@@ -17,7 +17,7 @@ index d980a556785b52fe827310b83638139df0816b11..3c8c02fc92374def12254f7ffad604b2
 
         return world.getBlockState(blockposition1).isRedstoneConductor(world, blockposition1);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e44328d3ac04512e79f1b1363e72bf5e82426782..aec89025473b9de9c5460cd4dc0bceeb24dcf345 100644
+index 316b0499c49924771d1361e35f3a4d2ce46a739b..b3fd2b88b84c16c77dd2dc7ca2331126c9174624 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -428,6 +428,11 @@ public class PurpurWorldConfig {
--- a/patches/server/0142-Implement-TPSBar.patch
+++ b/patches/server/0142-Implement-TPSBar.patch
--- a/patches/server/0143-Striders-give-saddle-back.patch
+++ b/patches/server/0143-Striders-give-saddle-back.patch
@@ -28,7 +28,7 @@ index 9d314470361b2e17afdadc355c084254e5b03aff..66dab9b4e5ae05deeae11c8588a0b855
             }
 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index aec89025473b9de9c5460cd4dc0bceeb24dcf345..4d978502c426c177a75b92a38b0ee03f38eeb697 100644
+index b3fd2b88b84c16c77dd2dc7ca2331126c9174624..8cdc3f0ff720aeb613b32e03b910aeda06ea916e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1552,6 +1552,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0144-PlayerBookTooLargeEvent.patch
+++ b/patches/server/0144-PlayerBookTooLargeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerBookTooLargeEvent


 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c1f322910d66c6d7961b33840a761a2e8f7a0424..844f76a712bec16fb7dea19fa27f45970bc61773 100644
+index a1687fe41480048a1d98fda8c5b704d874c47708..76c6b0c9b585879d63a232f6633ffd7c72656d0a 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1122,10 +1122,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
--- a/patches/server/0145-Full-netherite-armor-grants-fire-resistance.patch
+++ b/patches/server/0145-Full-netherite-armor-grants-fire-resistance.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Full netherite armor grants fire resistance


 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 fab14cd3148cb81a343b7b1fb4f94da977dba763..6301f71df9573f91040934c85a8530f2cf2bfdad 100644
+index d57a1984328750f5a6db748ef2db21fb3e2dff00..656b62c93dcbe15a79ebe684c18f4dc31ddc0dbe 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -360,6 +360,16 @@ public abstract class Player extends LivingEntity {
@@ -26,7 +26,7 @@ index fab14cd3148cb81a343b7b1fb4f94da977dba763..6301f71df9573f91040934c85a8530f2
 
     protected ItemCooldowns createItemCooldowns() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4d978502c426c177a75b92a38b0ee03f38eeb697..5aa1ecf7f9ae3b3ef6157e925bf8e0c750fedea4 100644
+index 8cdc3f0ff720aeb613b32e03b910aeda06ea916e..18142fa6aa364fa228d3b5baa4b36a07db44deff 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -265,6 +265,19 @@ public class PurpurWorldConfig {
--- a/patches/server/0146-Fix-rotating-UP-DOWN-CW-and-CCW.patch
+++ b/patches/server/0146-Fix-rotating-UP-DOWN-CW-and-CCW.patch
--- a/patches/server/0147-Add-MC-4-fix-back.patch
+++ b/patches/server/0147-Add-MC-4-fix-back.patch
--- a/patches/server/0148-Add-mobGriefing-bypass-to-everything-affected.patch
+++ b/patches/server/0148-Add-mobGriefing-bypass-to-everything-affected.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected


 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 49ecb743320aa3bfba2cd38f25ca5a37b38efe1f..9b6cfd16a15c176b144302b5c38408b88969fa50 100644
+index b909eeba0539ab133e274a15b0b479b5546fc903..11abf0df677a9d609d82cbcb8e3967fc4b613362 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1681,7 +1681,7 @@ public abstract class LivingEntity extends Entity {
@@ -144,7 +144,7 @@ index f637cd740ec3801ce1c387473b5c4ff6080e76ec..3247f3f3c9d53953f8268c8f95752751
                             // flag1 = this.level.a(blockposition, false) || flag1;
                             flag1 = true;
 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 5f24fb3fc4ffb2e032cf755d984716d1c3a3e965..232fe770b9befacc4d436a01139fe5fe46f92879 100644
+index ee13bdfb5cfc9992d26126804c0a0bb512c2eb1e..bdcbe92cbe431727f5879a04bf734811ffd03c3d 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
@@ -375,7 +375,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -393,7 +393,7 @@ index e98fc3c235f9160f1928a8afb0d7991a6d3430cb..db35f756b7adb6b113659ae13b08ab89
         return true;
         // Purpur end
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 5aa1ecf7f9ae3b3ef6157e925bf8e0c750fedea4..315e24bc0ef9950f68260e2f5aefbe0b7d421a1b 100644
+index 18142fa6aa364fa228d3b5baa4b36a07db44deff..affb6ce2c48b3bfbf3ded132b794908660d55ebb 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -367,9 +367,12 @@ public class PurpurWorldConfig {
@@ -680,7 +680,7 @@ index 5aa1ecf7f9ae3b3ef6157e925bf8e0c750fedea4..315e24bc0ef9950f68260e2f5aefbe0b
     }
 
     public boolean witherSkeletonRidable = false;
-@@ -1837,6 +1883,7 @@ public class PurpurWorldConfig {
+@@ -1835,6 +1881,7 @@ public class PurpurWorldConfig {
     public boolean zombieJockeyTryExistingChickens = true;
     public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
     public Difficulty zombieBreakDoorMinDifficulty = Difficulty.HARD;
@@ -688,7 +688,7 @@ index 5aa1ecf7f9ae3b3ef6157e925bf8e0c750fedea4..315e24bc0ef9950f68260e2f5aefbe0b
     private void zombieSettings() {
         zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
         zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -1856,6 +1903,7 @@ public class PurpurWorldConfig {
+@@ -1854,6 +1901,7 @@ public class PurpurWorldConfig {
         } catch (IllegalArgumentException ignore) {
             zombieBreakDoorMinDifficulty = Difficulty.HARD;
         }
--- a/patches/server/0149-Config-to-allow-Note-Block-sounds-when-blocked.patch
+++ b/patches/server/0149-Config-to-allow-Note-Block-sounds-when-blocked.patch
@@ -22,7 +22,7 @@ index d3c8fd8399629efb8bcbaf7d9a0c43340fcdfeda..c74df3b5c2a25469ad3fb6a853438bbc
             org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, blockposition, data.getValue(NoteBlock.INSTRUMENT), data.getValue(NoteBlock.NOTE));
             if (!event.isCancelled()) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 315e24bc0ef9950f68260e2f5aefbe0b7d421a1b..393d3ce76b833044daa3f18670780b848b95e5c9 100644
+index affb6ce2c48b3bfbf3ded132b794908660d55ebb..d1ad1f384ae289dd516cbe27e611c66d70ba4853 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -370,6 +370,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0150-Add-EntityTeleportHinderedEvent.patch
+++ b/patches/server/0150-Add-EntityTeleportHinderedEvent.patch
@@ -78,7 +78,7 @@ index 09cbce5aec6eabfa220f7de81b492a180cb8ca1e..265770975ad1190283103b04cdd52a07
 
             blockEntity.teleportCooldown = 100;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 393d3ce76b833044daa3f18670780b848b95e5c9..b967dfd7d675ed53a76fa743df0d3fbac1f414e8 100644
+index d1ad1f384ae289dd516cbe27e611c66d70ba4853..e1b8d150f952d2b80ad37caeb273f60c3553aa11 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -369,6 +369,7 @@ public class PurpurWorldConfig {
--- a/patches/server/0151-Add-StructureGenerateEvent.patch
+++ b/patches/server/0151-Add-StructureGenerateEvent.patch
@@ -19,7 +19,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com>

 diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
-index c7636191fa2ba92db95a7f779d0e5a1bd45198aa..6cd66a4edbe2010d2a34506baf1ba6fe3de38bb9 100644
+index a5d7fdd9ec0342e000e467a002846873a10d75fc..f71cc1f5e5d594e82a4e6132d438bae74b9370a7 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
@@ -311,7 +311,14 @@ public abstract class ChunkGenerator {
--- a/patches/server/0152-Farmland-trampling-changes.patch
+++ b/patches/server/0152-Farmland-trampling-changes.patch
@@ -12,7 +12,7 @@ necessary to trample in the first place. Feather Falling 1 requires
 you to fall over 3+ blocks to trample. FF 2 requires 4+, etc.

 diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-index 668724cfaf9f34fe057171b69213782a22f8013b..1d662162fbf8cf7afa5fac167f8bfee41a0060c0 100644
+index aad204181c4f54ee533bfe3fc04a8705b847e371..16eb80e7926cf4fe421c17d7d851d457a2bc0f5d 100644
 --- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
@@ -97,12 +97,20 @@ public class FarmBlock extends Block {
@@ -37,7 +37,7 @@ index 668724cfaf9f34fe057171b69213782a22f8013b..1d662162fbf8cf7afa5fac167f8bfee4
             if (CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.DIRT.defaultBlockState()).isCancelled()) {
                 return;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b967dfd7d675ed53a76fa743df0d3fbac1f414e8..0e8af1daaffd7deaceb58d2298e5c0d027959822 100644
+index e1b8d150f952d2b80ad37caeb273f60c3553aa11..5c021c6aef21ff3534a4b6a95fd1c0d5ac2ea2c1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -466,10 +466,16 @@ public class PurpurWorldConfig {
--- a/Show More
+++ b/Show More