Remove redundant patches that duplicate recent Paper changes

patches/api/0018-Villager-resetOffers.patch

@@ -1,24 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Mon, 7 Oct 2019 00:15:28 -0500
-Subject: [PATCH] Villager#resetOffers
-
-
-diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index 511b96841f7342d0a6b38d7cff56252ea8ef9bfe..0e2615b6e2be21abfb0116e6f1e02416bac97f74 100644
---- a/src/main/java/org/bukkit/entity/Villager.java
-+++ b/src/main/java/org/bukkit/entity/Villager.java
-@@ -113,6 +113,13 @@ public interface Villager extends AbstractVillager {
-      */
-     public void wakeup();
- 
-+    // Purpur start
-+    /**
-+     * Reset this villager's trade offers
-+     */
-+    public void resetOffers();
-+    // Purpur end
-+
-     /**
-      * Causes this villager to shake his head.
-      */

patches/api/0047-Add-force-and-prompt-parameters-to-resource-pack-api.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add force and prompt parameters to resource pack api
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index fcc4c6851ef932ab2e84d8758e7618856b98fdcf..91a2817c8a0874d3092de19837969e3867e88cbc 100644
+index 566c8f8b505c3bfc23044a836083a00b92cacedd..033cf450dcfb02e57d0875d0117086e6fe615c32 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1490,6 +1490,88 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

patches/server/0127-Zombie-break-door-minimum-difficulty-option.patch

@@ -1,69 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Fri, 27 Nov 2020 10:33:33 -0600
-Subject: [PATCH] Zombie break door minimum difficulty option
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
-index fe045f8e35fe2aac51032a67ce52b27a53a8eff0..03bc86c776596ca5964c22adb757115d60980311 100644
---- a/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
-@@ -7,6 +7,8 @@ import net.minecraft.world.entity.Mob;
- import net.minecraft.world.level.GameRules;
- import net.minecraft.world.level.block.Block;
- 
-+import static net.minecraft.world.Difficulty.*; // Purpur
-+
- public class BreakDoorGoal extends DoorInteractGoal {
- 
-     private static final int DEFAULT_DOOR_BREAK_TIME = 240;
-@@ -19,7 +21,7 @@ public class BreakDoorGoal extends DoorInteractGoal {
-         super(mob);
-         this.lastBreakProgress = -1;
-         this.doorBreakTime = -1;
--        this.validDifficulties = difficultySufficientPredicate;
-+        this.validDifficulties = mob instanceof net.minecraft.world.entity.monster.Zombie ? difficulty -> testDifficulty(mob) : difficultySufficientPredicate; // Purpur
-     }
- 
-     public BreakDoorGoal(Mob mob, int maxProgress, Predicate<Difficulty> difficultySufficientPredicate) {
-@@ -88,4 +90,16 @@ public class BreakDoorGoal extends DoorInteractGoal {
-     private boolean isValidDifficulty(Difficulty difficulty) {
-         return this.validDifficulties.test(difficulty);
-     }
-+
-+    // Purpur start
-+    private boolean testDifficulty(Mob entity) {
-+        Difficulty d = entity.level.getDifficulty();
-+        return switch (entity.level.purpurConfig.zombieBreakDoorMinDifficulty) {
-+            case PEACEFUL -> d == HARD || d == NORMAL || d == EASY || d == PEACEFUL;
-+            case EASY     -> d == HARD || d == NORMAL || d == EASY;
-+            case NORMAL   -> d == HARD || d == NORMAL;
-+            default       -> d == HARD;
-+        };
-+    }
-+    // Purpur end
- }
-diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e94f79558ea0c380957f7984b03cb9f90190dee2..51ac0f32f7ad56926523916b669086bb895d1f19 100644
---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1798,6 +1798,7 @@ public class PurpurWorldConfig {
-     public double zombieJockeyChance = 0.05D;
-     public boolean zombieJockeyTryExistingChickens = true;
-     public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
-+    public Difficulty zombieBreakDoorMinDifficulty = Difficulty.HARD;
-     private void zombieSettings() {
-         zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
-         zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -1812,6 +1813,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);
-+        try {
-+            zombieBreakDoorMinDifficulty = Difficulty.valueOf(getString("mobs.zombie.break-door-minimum-difficulty", zombieBreakDoorMinDifficulty.name()));
-+        } catch (IllegalArgumentException ignore) {
-+            zombieBreakDoorMinDifficulty = Difficulty.HARD;
-+        }
-     }
- 
-     public boolean zombieHorseRidableInWater = false;

patches/server/0128-Changeable-Mob-Left-Handed-Chance.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Changeable Mob Left Handed Chance
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index 437015eef7404362cb564dec72e3e87c79b4ff0b..e6aa1a5040bbd483a752f9c646fdb062a8e88871 100644
+index acc72884197076beee290c0a8091305b11fe51dc..2aeaa9d73dc7117bcdea7717906e4b4dc662c819 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -1210,7 +1210,7 @@ public abstract class Mob extends LivingEntity {
@@ -18,7 +18,7 @@ index 437015eef7404362cb564dec72e3e87c79b4ff0b..e6aa1a5040bbd483a752f9c646fdb062
          } 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 a22bc71ef48ce8c258753ee8bd083ddc450f91d6..78f558029ac9bb36133b45f357ac85425d474b0e 100644
+index e94f79558ea0c380957f7984b03cb9f90190dee2..2b246ec320e6e1874329786887e72fd1b9884119 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -130,8 +130,10 @@ public class PurpurWorldConfig {

patches/server/0129-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 f5a532d4c9773b46e436fb1341bf404b3919f6ee..126d06f0cd59e8e1298caf6cb8f8da15a691f34c 100644
+index 856f5e85d0367834d90e473fd9add868f91f2360..8df2dcc97091d1b3025f9a7296d3c7badb54a630 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -989,7 +989,16 @@ public class ServerPlayer extends Player {
@@ -27,7 +27,7 @@ index f5a532d4c9773b46e436fb1341bf404b3919f6ee..126d06f0cd59e8e1298caf6cb8f8da15
  
              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 78f558029ac9bb36133b45f357ac85425d474b0e..41dacbe19c2c42b755da0ce91e531c2c84f82016 100644
+index 2b246ec320e6e1874329786887e72fd1b9884119..e351e19ab26a3143c7b05c66a2e69fd2f3b443ab 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -365,6 +365,7 @@ public class PurpurWorldConfig {

patches/server/0130-Snow-Golem-rate-of-fire-config.patch

@@ -10,7 +10,7 @@ If min-shoot-interval-ticks and max-shoot-interval-ticks are both set to
 0, snow golems won't shoot any snowballs.
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index ee64f4084b25d77f1c25b76a5b7d90cd2547bffb..5e370d5137564ddcfb76a81b92d43e254f4a0ac4 100644
+index 9ea7682c7cb4c4be1c44d3dd12dc6954d44d659e..3ea3085d9b4256c1a37c99e79550f9773e8c0f71 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 @@ -73,7 +73,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
@@ -23,7 +23,7 @@ index ee64f4084b25d77f1c25b76a5b7d90cd2547bffb..5e370d5137564ddcfb76a81b92d43e25
          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 1958dbc63426e865fd607ea7795d6ed0d82ba518..fccb9ac4ec3f4d955a83bb0a1e15a00753c3cfea 100644
+index e351e19ab26a3143c7b05c66a2e69fd2f3b443ab..bab3327d5d04c9533e1992478d4f7798685a8e33 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1494,6 +1494,10 @@ public class PurpurWorldConfig {

patches/server/0131-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 af299caa01193a6fa76656814164b0c5fbeec350..8323b10a6ab17f56c6e5d1ad2cee9ebc7ad403de 100644
+index adcb7b6df1027fefc90f1affc9e6ab93b713e98e..defd23f85fb0e67511ee93f7f9c00cfceb71c484 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -204,6 +204,11 @@ public class PurpurConfig {

patches/server/0132-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 a1725ccc7b194c26c4f94561a228da9f56e24cfc..14c616f3159e4227da90c1fcc097bb46b11cc6f7 100644
+index 9f6c50391b85863f38a9dfc48aec894f74428373..c16f2f61592725a7e8dd17871620e9aef516386c 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
@@ -56,7 +56,7 @@ index a1725ccc7b194c26c4f94561a228da9f56e24cfc..14c616f3159e4227da90c1fcc097bb46
          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 fccb9ac4ec3f4d955a83bb0a1e15a00753c3cfea..757f88b3780eea63a386003f11d3c6c00b92f90c 100644
+index bab3327d5d04c9533e1992478d4f7798685a8e33..b523f87b5ffdf4df5d806b1b512b241e60921c10 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1667,6 +1667,8 @@ public class PurpurWorldConfig {

patches/server/0133-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch

@@ -145,7 +145,7 @@ index b615dc2a2127f0874775d1707e96edfb4d95b987..72ae6b3282aac806ae11b87024ee940e
              brain.setMemory(MemoryModuleType.SECONDARY_JOB_SITE, list);
          } else {
 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 14c616f3159e4227da90c1fcc097bb46b11cc6f7..7a3c19b07c87394bc73ea16f9f0be22d7ea4f470 100644
+index c16f2f61592725a7e8dd17871620e9aef516386c..1397d9e49194f09ad6ba3fd0cbd6c368c99e133e 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -238,7 +238,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -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 757f88b3780eea63a386003f11d3c6c00b92f90c..227ca3ef5c85b524d929e3f3076520d9abbc8f35 100644
+index b523f87b5ffdf4df5d806b1b512b241e60921c10..4cdeae00f24a81e5b49333cd611c2152411cfaef 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1669,6 +1669,8 @@ public class PurpurWorldConfig {

patches/server/0134-Toggle-for-Zombified-Piglin-death-always-counting-as.patch

@@ -13,7 +13,7 @@ to the Piglin being angry, even though the player never hit them.
 This patch adds a toggle to disable this behavior.
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-index 5b5958e37918b97fa994500fe94cd0e57faa1948..64216c9d76ce5ec6a845915ca078b0c0fb0199d4 100644
+index 96e727cd703a1da5f60ab07e47b6bc5265b309e4..50553ab4ea1e7c8ae58988ce959188408cb03913 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 @@ -137,7 +137,7 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
@@ -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 227ca3ef5c85b524d929e3f3076520d9abbc8f35..4b701fa6d5dc1807276dcb29305da1d7c10686d0 100644
+index 4cdeae00f24a81e5b49333cd611c2152411cfaef..3539cdb60b893693687219b689f30d1aa6c1d837 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1901,6 +1901,7 @@ public class PurpurWorldConfig {
+@@ -1895,6 +1895,7 @@ public class PurpurWorldConfig {
      public boolean zombifiedPiglinJockeyOnlyBaby = true;
      public double zombifiedPiglinJockeyChance = 0.05D;
      public boolean zombifiedPiglinJockeyTryExistingChickens = true;
@@ -46,7 +46,7 @@ index 227ca3ef5c85b524d929e3f3076520d9abbc8f35..4b701fa6d5dc1807276dcb29305da1d7
      private void zombifiedPiglinSettings() {
          zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
          zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
-@@ -1914,5 +1915,6 @@ public class PurpurWorldConfig {
+@@ -1908,5 +1909,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);

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

@@ -6,7 +6,7 @@ Subject: [PATCH] Spread out and optimise player list ticksSpread out and
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index bd5ab259d37f13542c2510530fdf5fc5d6496975..e17c61e3b807dbc1a7bca4952349145617204154 100644
+index a6846a4553bf00379c54d1b77d30d25389a389ca..c53acfd01eac8c64f068a3c2a2a458b0c1b033a1 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1011,22 +1011,22 @@ public abstract class PlayerList {
@@ -46,7 +46,7 @@ index bd5ab259d37f13542c2510530fdf5fc5d6496975..e17c61e3b807dbc1a7bca49523491456
  
      public void broadcastAll(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 04d178af71fcf353b967c891e4a46835cb731599..f9d00b4bd00f8e0a7680a99e94d09fe2f311cbac 100644
+index f2ba626bb16d3b94b28e6d5cffc257caf8875195..4c6c2f1fbbdbb950ab5ef363d0106105991afcf9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1570,7 +1570,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

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

@@ -7,7 +7,7 @@ Configurable chance to spawn a wolf that is rabid.
 Rabid wolves attack all players, mobs, and animals.
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index ef4abaf68de01b0879f7d0b330d2d57cc6bd10f9..3e7409ebf1f94b9cf55f2d0b0fe17ca8ec44659f 100644
+index 9ad96fec6110e26c0074c07fd8e2453e1d4271bb..055cc874ec5fb9c3268b566620bf62adda6aa85a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 @@ -10,22 +10,28 @@ import net.minecraft.network.syncher.EntityDataAccessor;
@@ -201,7 +201,7 @@ 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 4b701fa6d5dc1807276dcb29305da1d7c10686d0..31070a902c8ca37a4fe211b264e747fb476849d6 100644
+index 3539cdb60b893693687219b689f30d1aa6c1d837..b6967a953b8e3bf96653ce6f32af2c5a4a9d0509 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1788,6 +1788,8 @@ public class PurpurWorldConfig {

patches/server/0137-Configurable-default-collar-color.patch

@@ -9,7 +9,7 @@ Resets to RED when the value is invalid.
 test
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-index 052d1e51a891ee17bed0043f6f3fd162c15b16b2..cea244bae0449a52b04989d1db1e4fbbd178241c 100644
+index bad5b47f3df186c77e578d5953cf1798179639d3..8355aa65b6f8be5027370fada8758510b774b4b2 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
 @@ -366,6 +366,14 @@ public class Cat extends TamableAnimal {
@@ -28,7 +28,7 @@ index 052d1e51a891ee17bed0043f6f3fd162c15b16b2..cea244bae0449a52b04989d1db1e4fbb
      public Cat getBreedOffspring(ServerLevel world, AgeableMob entity) {
          Cat entitycat = (Cat) EntityType.CAT.create((Level) world);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index 3e7409ebf1f94b9cf55f2d0b0fe17ca8ec44659f..518dd0e6b4889c049e438b393baa795a5eac3e7d 100644
+index 055cc874ec5fb9c3268b566620bf62adda6aa85a..bad3b1e32a8c8035542243a69028b3a8622019b8 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 @@ -188,6 +188,12 @@ public class Wolf extends TamableAnimal implements NeutralMob {
@@ -45,7 +45,7 @@ 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 31070a902c8ca37a4fe211b264e747fb476849d6..2ebd9fa697a5835d67289da72ad62be638996947 100644
+index b6967a953b8e3bf96653ce6f32af2c5a4a9d0509..0bf9306bb31e975101dccc3df4c776f16af84391 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -614,6 +614,7 @@ public class PurpurWorldConfig {

patches/server/0138-Phantom-flames-on-swoop.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Phantom flames on swoop
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 59033a5c28f672089fe3ad846775753ae90f9ad9..a575649cff83df5c0888ba48610ece084cacaaa1 100644
+index 789224c6285cde2009e000d98e190c36459f04e8..26ef372ddeb707ad0962297ce736c245f713d9f2 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 @@ -227,6 +227,7 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -17,7 +17,7 @@ index 59033a5c28f672089fe3ad846775753ae90f9ad9..a575649cff83df5c0888ba48610ece08
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2ebd9fa697a5835d67289da72ad62be638996947..58ba582c9675b20096d9aeda26c3c3013af5c0dc 100644
+index 0bf9306bb31e975101dccc3df4c776f16af84391..c9218a478d5955b5add90cf21e2d8df77a0c6e08 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1204,6 +1204,7 @@ public class PurpurWorldConfig {

patches/server/0139-Option-for-chests-to-open-even-with-a-solid-block-on.patch

@@ -17,7 +17,7 @@ index eecb8c089b5f426b1395b47f714af32c210555ef..ac82e2b0f4ca1232cc7ec6e4c7dd2613
  
          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 10c6c8a053acf761e2645c86823d1e2eb7c13e13..dcaca117ed5bf3b9c2459cbe72c7752e96b84850 100644
+index c9218a478d5955b5add90cf21e2d8df77a0c6e08..27f37620f3eda28bc3a8834fd335aeeac38ccbf5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -442,6 +442,11 @@ public class PurpurWorldConfig {

patches/server/0141-Striders-give-saddle-back.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Striders give saddle back
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Strider.java b/src/main/java/net/minecraft/world/entity/monster/Strider.java
-index 9d314470361b2e17afdadc355c084254e5b03aff..66dab9b4e5ae05deeae11c8588a0b855d8847bdc 100644
+index 22ce93fd265d3fa9967e6467301e8128635f2391..762542252e59da20f284dde2545889da3340454e 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
 @@ -451,6 +451,18 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
@@ -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 db26fd687afc83fb914ac274ae719ab6a402e05e..46b4b9ac778424e7e8a0a51932ec99e2717c5c56 100644
+index 27f37620f3eda28bc3a8834fd335aeeac38ccbf5..af48e54639b412feb8dee36705d0aa8980b7ea53 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1579,6 +1579,7 @@ public class PurpurWorldConfig {

patches/server/0142-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 5835d6f1603bbe1ba2490c9393e90908e31812f9..94fc95f79e74f6b3e7d9cd666788cc105b4e24cb 100644
+index 5c9064ddcb74f789da713462ccf358bf8a881eb5..087abd2f3d8cd3f57e272551f8c576e330dda54f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1136,10 +1136,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

patches/server/0143-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 5b0647a8b8d2dd8a44b38c378312ad917d5314d9..d7a3d2928a63517a1513f5572b121f77979f1b17 100644
+index 1356a027255671cc2d05db22c350506a928695ce..2ac738bfa2fc61150e2cd8ca0c3988aeffeb6427 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 5b0647a8b8d2dd8a44b38c378312ad917d5314d9..d7a3d2928a63517a1513f5572b121f77
  
      protected ItemCooldowns createItemCooldowns() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 666dcdc11178ea576c84f50e37da57f3844b7bf4..a8390aad9b3991ae83102de0057a2ed45914c612 100644
+index af48e54639b412feb8dee36705d0aa8980b7ea53..ae252c66d4319fa4a581f1da9ec926de646a5aa0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -267,6 +267,19 @@ public class PurpurWorldConfig {

patches/server/0145-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 ff37a1dc067da82b9496da4cea2cf267cebe1b0a..ccf420a7447fdc2a466f2e6677eaacdda0e11a36 100644
+index ccaa225eb0e2f88b4cb91cf72cd2082a81d36de6..733a9827554f129809e77fe41174b5b2b89b8e5c 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 {
@@ -18,7 +18,7 @@ index ff37a1dc067da82b9496da4cea2cf267cebe1b0a..ccf420a7447fdc2a466f2e6677eaacdd
                      BlockState iblockdata = Blocks.WITHER_ROSE.defaultBlockState();
  
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index e6aa1a5040bbd483a752f9c646fdb062a8e88871..a53173ec096c059e1913f4af124c834b5411e5bc 100644
+index 2aeaa9d73dc7117bcdea7717906e4b4dc662c819..5ddf29a8d6d3d8d48641c41ef6913c9e20811485 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -661,7 +661,7 @@ public abstract class Mob extends LivingEntity {
@@ -44,10 +44,10 @@ index 8d6d47456ce6f9870f1a682665780a301b92fec5..b67b877e3fa9c00a0b88dbe3e8b0f0e9
          } else if (entity.getVillagerData().getProfession() != VillagerProfession.FARMER && !(world.purpurConfig.villagerClericsFarmWarts && entity.getVillagerData().getProfession() == VillagerProfession.CLERIC)) { // Purpur
              return false;
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
-index 03bc86c776596ca5964c22adb757115d60980311..2eda2dc7f234c068f48af5b35803bc92321ee58a 100644
+index fe045f8e35fe2aac51032a67ce52b27a53a8eff0..56d2849276b322436544512521e3b4ea0c679bcc 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/BreakDoorGoal.java
-@@ -35,7 +35,7 @@ public class BreakDoorGoal extends DoorInteractGoal {
+@@ -33,7 +33,7 @@ public class BreakDoorGoal extends DoorInteractGoal {
  
      @Override
      public boolean canUse() {
@@ -92,7 +92,7 @@ index ac5779319081a6894373877067edf958da8a9cf5..24227a18ea1d0c06e2049542c8ca9c82
          } else if (this.nextStartTick > 0) {
              --this.nextStartTick;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index ba1bfad397d62dd6feccdbbe3288997cfe16ce84..5750b42a3f522402e9cea573204cf31f6ab0c287 100644
+index 03e75add762b19170e95d1b280f92e79f2f8f9bf..091177ac2a5995b9f6f0b5245e8eabefd4ed86d6 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
 @@ -1346,7 +1346,7 @@ public class Fox extends Animal {
@@ -105,7 +105,7 @@ index ba1bfad397d62dd6feccdbbe3288997cfe16ce84..5750b42a3f522402e9cea573204cf31f
  
                  if (iblockdata.is(Blocks.SWEET_BERRY_BUSH)) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-index 8d15e7ec0ae4bcdfd5628f41c0fc236eaa85d548..f2d5c9e5c93d2b93d5188491d0f6239bbdf84e78 100644
+index e7adecb2324efaedd6aad3aa1213d53765b09b7e..74ee531befc67495e18d4b97a4e4b14e51830de5 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 @@ -611,7 +611,7 @@ public class Rabbit extends Animal {
@@ -118,7 +118,7 @@ index 8d15e7ec0ae4bcdfd5628f41c0fc236eaa85d548..f2d5c9e5c93d2b93d5188491d0f6239b
                  }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index 5e370d5137564ddcfb76a81b92d43e254f4a0ac4..0549e3d3cd3a9fddcb0d8edc56fb1fddc1c19802 100644
+index 3ea3085d9b4256c1a37c99e79550f9773e8c0f71..c931bf7ec3c58eae012bbadb9d3e9fef69b3fc79 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 @@ -125,7 +125,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
@@ -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 ee13bdfb5cfc9992d26126804c0a0bb512c2eb1e..bdcbe92cbe431727f5879a04bf734811ffd03c3d 100644
+index ff71f78497681805246d7b3e4ac59288db9af997..4407c9f25e88a3685c6e9f8c7775d3011b38fff2 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
@@ -166,7 +166,7 @@ index ee13bdfb5cfc9992d26126804c0a0bb512c2eb1e..bdcbe92cbe431727f5879a04bf734811
                      j = Mth.floor(this.getX());
                      int i1 = Mth.floor(this.getZ());
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index cda677a5cb5b9993764be24140bc9b27cc3298af..0192c5502037b8f93e6507e7dcb9229201d29d36 100644
+index 96858c10ad219a47187d3008387355f1bcfdc789..aea8de335294320e3734bea4fbc4bab91d1de59a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -344,7 +344,7 @@ public class Creeper extends Monster implements PowerableMob {
@@ -179,7 +179,7 @@ index cda677a5cb5b9993764be24140bc9b27cc3298af..0192c5502037b8f93e6507e7dcb92292
  
              // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index f701807f2593189632a2a556e82bc0f1ba692dbf..17e33ac7125d7474fe5f1ea2ca3d1916e016a1c8 100644
+index c5795f7b8cb66e633ea22af3f5b44f9995628f9e..98bba53dd8b910a644b318cbf47480ec3706489e 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -482,7 +482,7 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -201,7 +201,7 @@ index f701807f2593189632a2a556e82bc0f1ba692dbf..17e33ac7125d7474fe5f1ea2ca3d1916
  
          @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Evoker.java b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
-index 0ae0a49da681c6603d6f1504ee58f99b8f345e44..01b5a4e75af2aa4f9c59ca77fd91fe62d10fe39b 100644
+index 9e50cf5d5b48718b1f8ff74c4de891172970ac12..78b2350a09eef0537742af429cfa5f022fc92ad3 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
 @@ -316,7 +316,7 @@ public class Evoker extends SpellcasterIllager {
@@ -214,7 +214,7 @@ index 0ae0a49da681c6603d6f1504ee58f99b8f345e44..01b5a4e75af2aa4f9c59ca77fd91fe62
              } else {
                  List<Sheep> list = Evoker.this.level.getNearbyEntities(Sheep.class, this.wololoTargeting, Evoker.this, Evoker.this.getBoundingBox().inflate(16.0D, 4.0D, 16.0D));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index b8c753a574487cdc045ea334229aafd257d6e223..4e72c6876dff1a03bb6736c8e90463cd51dadcb5 100644
+index 13f4b6d17312dd7379875eb56049c87c10deae88..1148cd343f9931848b5119d8bddc9b5218d67490 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 @@ -184,7 +184,7 @@ public class Ravager extends Raider {
@@ -227,7 +227,7 @@ index b8c753a574487cdc045ea334229aafd257d6e223..4e72c6876dff1a03bb6736c8e90463cd
                  AABB axisalignedbb = this.getBoundingBox().inflate(0.2D);
                  Iterator iterator = BlockPos.betweenClosed(Mth.floor(axisalignedbb.minX), Mth.floor(axisalignedbb.minY), Mth.floor(axisalignedbb.minZ), Mth.floor(axisalignedbb.maxX), Mth.floor(axisalignedbb.maxY), Mth.floor(axisalignedbb.maxZ)).iterator();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-index 0d60d6352294fadc1a26579a712b01cf0da681af..b9d5a03000b3b0759d786ac69e30d6a9d25146b3 100644
+index 1c523c384668b483ba0211c413ade7b87c7ca16a..9caf164f1b68034dd36671e94c9b60e225bde691 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
 @@ -195,7 +195,7 @@ public class Silverfish extends Monster {
@@ -249,7 +249,7 @@ index 0d60d6352294fadc1a26579a712b01cf0da681af..b9d5a03000b3b0759d786ac69e30d6a9
                      BlockPos blockposition = (new BlockPos(this.mob.getX(), this.mob.getY() + 0.5D, this.mob.getZ())).relative(this.selectedDirection);
                      BlockState iblockdata = this.mob.level.getBlockState(blockposition);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-index 79f075e7d7e5d8312f5a9ed47bea2a558b9491d5..ff8791b9202d6487afbf7b9dafc5dda375f73a5a 100644
+index e395f540590b9a820fb445e31ab48b79493bd2ff..d95b69ddd52fd444c2f314eb8776e58b487fdbd4 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 @@ -409,7 +409,7 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
@@ -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 43c4545b130e2a0178d3bfecc681dd82469eff99..3cd4988e9259697d95cddbe5d7c25b3ac0266b4d 100644
+index ae252c66d4319fa4a581f1da9ec926de646a5aa0..c73c77a22317631da7f8f52037103744bf9b8024 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -381,9 +381,12 @@ public class PurpurWorldConfig {
@@ -680,18 +680,18 @@ index 43c4545b130e2a0178d3bfecc681dd82469eff99..3cd4988e9259697d95cddbe5d7c25b3a
      }
  
      public boolean witherSkeletonRidable = false;
-@@ -1862,6 +1908,7 @@ public class PurpurWorldConfig {
+@@ -1861,6 +1907,7 @@ public class PurpurWorldConfig {
+     public double zombieJockeyChance = 0.05D;
      public boolean zombieJockeyTryExistingChickens = true;
      public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
-     public Difficulty zombieBreakDoorMinDifficulty = Difficulty.HARD;
 +    public boolean zombieBypassMobGriefing = false;
      private void zombieSettings() {
          zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
          zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -1881,6 +1928,7 @@ public class PurpurWorldConfig {
+@@ -1875,6 +1922,7 @@ public class PurpurWorldConfig {
-         } catch (IllegalArgumentException ignore) {
+         zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
-             zombieBreakDoorMinDifficulty = Difficulty.HARD;
+         zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
-         }
+         zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);
 +        zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
      }
  

patches/server/0146-Config-to-allow-Note-Block-sounds-when-blocked.patch

@@ -22,7 +22,7 @@ index 59ae3bb34678cdb5241f691915c96d6568363d3b..f6c0c9fca005f72c3764a4a4f8df0582
              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 8df99d5ccee0ff4280a720b2373407e51f4d4ec2..fd9ba48619b103071f9de669dea7d59bd2db2fee 100644
+index c73c77a22317631da7f8f52037103744bf9b8024..c70a804b8b7a30411f6cfa72bb2f36d411e0af30 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -384,6 +384,7 @@ public class PurpurWorldConfig {

patches/server/0147-Add-EntityTeleportHinderedEvent.patch

@@ -59,7 +59,7 @@ index bc2f2c69d437e99cb965cede7dfd42228151b26c..fef1027829c44957e23c0a121033bfb7
              EntityPortalEnterEvent event = new EntityPortalEnterEvent(entity.getBukkitEntity(), new org.bukkit.Location(world.getWorld(), pos.getX(), pos.getY(), pos.getZ()));
              world.getCraftServer().getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-index 09cbce5aec6eabfa220f7de81b492a180cb8ca1e..265770975ad1190283103b04cdd52a07e25aab49 100644
+index b2c098a02008b860b2fb17323831ab8af27751ae..1405083cb3e9e01d9dd99a9e42b2b56f3a104a60 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 @@ -179,6 +179,14 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
@@ -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 c9fb98c7aacf0745ee5f008629ebfe2d117f664d..58812794be7c3676fa527cdeb8e48e243e73dffd 100644
+index c70a804b8b7a30411f6cfa72bb2f36d411e0af30..4432330c936e060b1bb5005ebe70cf575249e5d9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -383,6 +383,7 @@ public class PurpurWorldConfig {
@@ -113,7 +113,7 @@ index f8811514c155f743f6e93c9a88721903fdb1bddd..501f9310bdc13b6d38dcdda4ad7fdfd1
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index acca95dbf81a5c8fcffc496431dd65579d323701..2aab21f43e3c5564d1970be7a98a08e2a68d10a8 100644
+index 4c6c2f1fbbdbb950ab5ef363d0106105991afcf9..3368b953b364faf2cde8e242d59fa8c6febc105f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1009,6 +1009,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0149-Farmland-trampling-changes.patch

@@ -37,7 +37,7 @@ index e06a8a68ccb9c9a77df061264e58fd850cf1f794..010da2b44fa3a4f033e4f86e9a0917b5
              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 6b02ac8a7ed8e4787abf017af23936718cee8d9c..8eda95b6b8c71fdc2c1938304b51c626f66235bd 100644
+index 4432330c936e060b1bb5005ebe70cf575249e5d9..7a3b246cd6254b7806b54f4f4d23fd22a2cba8a8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -480,10 +480,16 @@ public class PurpurWorldConfig {

patches/server/0150-Movement-options-for-armor-stands.patch

@@ -66,7 +66,7 @@ index bb710e62477df3048d5219f1edfa9ffdefacb41d..aee5db3cdbc49de995780d0b0e219d08
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 31c1e612a40c13e97b3784db9ef211265bb6f3f6..d330d23e63e3da106e8a44545792adfffc8d7918 100644
+index 7a3b246cd6254b7806b54f4f4d23fd22a2cba8a8..7b0ec253d7ed4e6207d4f82e84b7c6383fae2821 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -103,10 +103,16 @@ public class PurpurWorldConfig {

patches/server/0151-Fix-stuck-in-portals.patch

@@ -37,7 +37,7 @@ index e096e5268330b47be2e629abdc34ed4ff54009d9..3c5347c0d4b65ced4b942504b1cdb8aa
  
              this.isInsidePortal = true;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d330d23e63e3da106e8a44545792adfffc8d7918..31ddbe88a7a2d4e0b1f0dc9afdff738e4f457f96 100644
+index 7b0ec253d7ed4e6207d4f82e84b7c6383fae2821..087bf58786d6a1e1f812319be615a53c02f6bfda 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -297,6 +297,7 @@ public class PurpurWorldConfig {

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

@@ -1174,7 +1174,7 @@ index c5dbb1c8210b71f7d9d91089cb139f65605573a8..e5b78c9d6fb326771d65ea9afd9da38c
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 31ddbe88a7a2d4e0b1f0dc9afdff738e4f457f96..ea2a1c56ced20cad17634c7871f40f07cde3c187 100644
+index 087bf58786d6a1e1f812319be615a53c02f6bfda..08709de2f81fb637cf951cb2d76dfd759fb429b5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -600,6 +600,7 @@ public class PurpurWorldConfig {
@@ -2217,23 +2217,23 @@ index 31ddbe88a7a2d4e0b1f0dc9afdff738e4f457f96..ea2a1c56ced20cad17634c7871f40f07
      }
  
      public boolean zombieRidable = false;
-@@ -1927,6 +2065,7 @@ public class PurpurWorldConfig {
+@@ -1926,6 +2064,7 @@ public class PurpurWorldConfig {
+     public boolean zombieJockeyTryExistingChickens = true;
      public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
-     public Difficulty zombieBreakDoorMinDifficulty = Difficulty.HARD;
      public boolean zombieBypassMobGriefing = false;
 +    public boolean zombieTakeDamageFromWater = false;
      private void zombieSettings() {
          zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
          zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -1947,6 +2086,7 @@ public class PurpurWorldConfig {
+@@ -1941,6 +2080,7 @@ public class PurpurWorldConfig {
-             zombieBreakDoorMinDifficulty = Difficulty.HARD;
+         zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
-         }
+         zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);
          zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
 +        zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater);
      }
  
      public boolean zombieHorseRidableInWater = false;
-@@ -1958,6 +2098,7 @@ public class PurpurWorldConfig {
+@@ -1952,6 +2092,7 @@ public class PurpurWorldConfig {
      public double zombieHorseMovementSpeedMin = 0.2D;
      public double zombieHorseMovementSpeedMax = 0.2D;
      public double zombieHorseSpawnChance = 0.0D;
@@ -2241,7 +2241,7 @@ index 31ddbe88a7a2d4e0b1f0dc9afdff738e4f457f96..ea2a1c56ced20cad17634c7871f40f07
      private void zombieHorseSettings() {
          zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
          zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);
-@@ -1974,6 +2115,7 @@ public class PurpurWorldConfig {
+@@ -1968,6 +2109,7 @@ public class PurpurWorldConfig {
          zombieHorseMovementSpeedMin = getDouble("mobs.zombie_horse.attributes.movement_speed.min", zombieHorseMovementSpeedMin);
          zombieHorseMovementSpeedMax = getDouble("mobs.zombie_horse.attributes.movement_speed.max", zombieHorseMovementSpeedMax);
          zombieHorseSpawnChance = getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
@@ -2249,7 +2249,7 @@ index 31ddbe88a7a2d4e0b1f0dc9afdff738e4f457f96..ea2a1c56ced20cad17634c7871f40f07
      }
  
      public boolean zombieVillagerRidable = false;
-@@ -1983,6 +2125,7 @@ public class PurpurWorldConfig {
+@@ -1977,6 +2119,7 @@ public class PurpurWorldConfig {
      public boolean zombieVillagerJockeyOnlyBaby = true;
      public double zombieVillagerJockeyChance = 0.05D;
      public boolean zombieVillagerJockeyTryExistingChickens = true;
@@ -2257,7 +2257,7 @@ index 31ddbe88a7a2d4e0b1f0dc9afdff738e4f457f96..ea2a1c56ced20cad17634c7871f40f07
      private void zombieVillagerSettings() {
          zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
          zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
-@@ -1996,6 +2139,7 @@ public class PurpurWorldConfig {
+@@ -1990,6 +2133,7 @@ public class PurpurWorldConfig {
          zombieVillagerJockeyOnlyBaby = getBoolean("mobs.zombie_villager.jockey.only-babies", zombieVillagerJockeyOnlyBaby);
          zombieVillagerJockeyChance = getDouble("mobs.zombie_villager.jockey.chance", zombieVillagerJockeyChance);
          zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens);
@@ -2265,7 +2265,7 @@ index 31ddbe88a7a2d4e0b1f0dc9afdff738e4f457f96..ea2a1c56ced20cad17634c7871f40f07
      }
  
      public boolean zombifiedPiglinRidable = false;
-@@ -2006,6 +2150,7 @@ public class PurpurWorldConfig {
+@@ -2000,6 +2144,7 @@ public class PurpurWorldConfig {
      public double zombifiedPiglinJockeyChance = 0.05D;
      public boolean zombifiedPiglinJockeyTryExistingChickens = true;
      public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true;
@@ -2273,7 +2273,7 @@ index 31ddbe88a7a2d4e0b1f0dc9afdff738e4f457f96..ea2a1c56ced20cad17634c7871f40f07
      private void zombifiedPiglinSettings() {
          zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
          zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
-@@ -2020,5 +2165,6 @@ public class PurpurWorldConfig {
+@@ -2014,5 +2159,6 @@ public class PurpurWorldConfig {
          zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance);
          zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);
          zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);

patches/server/0153-Config-to-always-tame-in-Creative.patch

@@ -59,7 +59,7 @@ index 1193f711442fc8d0d3631cbb7fe4a31bf7639f1b..c681cbcd4549d6bf2d88408b94fbb31c
                      this.navigation.stop();
                      this.setTarget((LivingEntity) null);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ea2a1c56ced20cad17634c7871f40f07cde3c187..4863ce93475ec25c0cece1fbcb9b1c5ca90ac5b3 100644
+index 08709de2f81fb637cf951cb2d76dfd759fb429b5..4e3bf53c088ec64882cf87c5e3facdaeb034e02e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -385,6 +385,7 @@ public class PurpurWorldConfig {

patches/server/0154-End-crystal-explosion-options.patch

@@ -52,7 +52,7 @@ index 92e65f3fbc8f5d77bb8cc31e7a7780c2589f4227..0c46507ab0b904fb1f79bc5421c88c03
  
                  this.onDestroyedBy(source);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 8449637ff57ac78c1936313f2dd559b1f61b0c92..e80bad1049c51998614e5c9fb917dee8a2a8bb95 100644
+index 4e3bf53c088ec64882cf87c5e3facdaeb034e02e..3b75437f3e78d7d00ca0b41f85e18dc11bdc0f1c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -487,6 +487,35 @@ public class PurpurWorldConfig {

patches/server/0155-Add-unsafe-Entity-serialization-API.patch

@@ -34,7 +34,7 @@ index 501f9310bdc13b6d38dcdda4ad7fdfd19216d6e6..5ae88a924b2f2cfd714bd693eebc708e
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 408863b137b7bda3f3e654ac3665ddeefb6d9e7b..1a3170810dacc3017dc16c2dd2ceca3d40023b2a 100644
+index ac64c94048edb8b8b2e049ed1b0c366eadbb01be..d5bfcadd00d2035c3fb8bd2ba71c1912372f6dcc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -407,9 +407,14 @@ public final class CraftMagicNumbers implements UnsafeValues {

patches/server/0156-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch

@@ -29,7 +29,7 @@ index 3de45a7a54643109fc6a8287879cf6dae87e72ec..2f9e10be559bbf685bbe8b4ac4b8a55a
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index df753f279bd24f23a6b882e124d7df176dd1bca4..bb110a2123faf072364145439320442ed4a89edf 100644
+index 3b75437f3e78d7d00ca0b41f85e18dc11bdc0f1c..cadde9d8772d61edd0e041b508e0abebbd076454 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -922,6 +922,7 @@ public class PurpurWorldConfig {

patches/server/0157-Dont-run-with-scissors.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Dont run with scissors!
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 94fc95f79e74f6b3e7d9cd666788cc105b4e24cb..11b9ba2bb00a9bb198cd82aca37cd4201c184e66 100644
+index 087abd2f3d8cd3f57e272551f8c576e330dda54f..27a707c9dfc52a043c98aa39ba9307a71e32a232 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1569,6 +1569,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -56,7 +56,7 @@ index 039c5e6d98228837f7818803641656d566e416f5..1e09dc436ce147d42035d48918b811eb
  
      public static String serverModName = "Purpur";
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ae8fe8d635acad84e79498fb5bf6db6469fbb7dd..198536d8f06f52623ae7492d2e0a6d428d4f72d1 100644
+index cadde9d8772d61edd0e041b508e0abebbd076454..a401e7280e888d15203c03b7cb999e4cfd3f1077 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -157,6 +157,8 @@ public class PurpurWorldConfig {

patches/server/0158-One-Punch-Man.patch

@@ -30,7 +30,7 @@ index 733a9827554f129809e77fe41174b5b2b89b8e5c..b2dbe65f07ecc25be810f80aaf05d924
                  if (human) {
                      // PAIL: Be sure to drag all this code from the EntityHuman subclass each update.
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f3a9bae0079eadfd3734930d4b2d1ee377085843..0c301b690b0f6c529f46c90b975348b30247a4e5 100644
+index a401e7280e888d15203c03b7cb999e4cfd3f1077..0cf7884c2896dec8c3352547c8838d010506e973 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -302,6 +302,7 @@ public class PurpurWorldConfig {

patches/server/0159-Add-config-for-snow-on-blue-ice.patch

@@ -29,7 +29,7 @@ index 0169d874247a96c2e10a65ecb9c0c093f5a6ecfb..b760e2d014b3ae70671878082bb853b7
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6d0c419ca584d41bfe9974278d78ceeb7166f393..f5d4fec6a1a648d775ea8be0b511a22958c4a2c5 100644
+index 0cf7884c2896dec8c3352547c8838d010506e973..7b8a638a9472b8c350561ac424dd513b17b4cacd 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -548,6 +548,11 @@ public class PurpurWorldConfig {

patches/server/0160-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] Configurable Ender Pearl cooldown, damage, and Endermite RNG
 - Endermite spawn chance
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
-index a65e0a3357a27dfdf62ba45ebfeb531958851285..c2db9485e69b9679a33a57bc84cf2c76c1de2a42 100644
+index 6599f267e30d15ad179e98d3683273cd9bbc3bd0..723b1ed5078084b7f85424f66e4f7b314fc05dda 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
 @@ -69,7 +69,7 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
@@ -43,7 +43,7 @@ index 749ab72edc0d2e9c6f1161415ab8d59d3d6ca976..897c202c0905040072a06fdfa2032a7f
                  // Paper end
                  if (user instanceof net.minecraft.server.level.ServerPlayer) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f5d4fec6a1a648d775ea8be0b511a22958c4a2c5..16d8181614fd7ffaf682438d3fb348c133a82620 100644
+index 7b8a638a9472b8c350561ac424dd513b17b4cacd..b05787589df4066dd252e9f69336065ae29dda29 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -159,6 +159,10 @@ public class PurpurWorldConfig {

patches/server/0161-Config-to-ignore-nearby-mobs-when-sleeping.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Config to ignore nearby mobs when sleeping
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4b90ebeae7dccef28dc7fca101d5e82cfde9ee70..71542d8f5f25485e99682470264c619e7d52bebf 100644
+index 33e36a80edbc80f0f562842ed690dccc13cc2e94..af22f5b80fd8d7aba8d12d84196a57e8f054fec2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1305,7 +1305,7 @@ public class ServerPlayer extends Player {
@@ -18,7 +18,7 @@ index 4b90ebeae7dccef28dc7fca101d5e82cfde9ee70..71542d8f5f25485e99682470264c619e
                          }
                      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index ddb2733fc4a23fa480cdb708e4ebab9b6e827a43..54e276877fe4ba5180fff54485561792301bf8b1 100644
+index b05787589df4066dd252e9f69336065ae29dda29..39f07342dc272aa4a9727b1fff523b21a68cee43 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -311,6 +311,7 @@ public class PurpurWorldConfig {

patches/server/0163-Config-Enderman-aggressiveness-towards-Endermites.patch

@@ -18,7 +18,7 @@ index f815cb228c46b9fa613d831bf748518e89a0772d..478b78c2c293d9f724d98ef3d600f52b
      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d7de8a7b89f22974c3045a9c28daf65260e7fc98..24798c3bfd17ba8383720d759050b4c906543f39 100644
+index 39f07342dc272aa4a9727b1fff523b21a68cee43..7229ab7701ca2cfcf9690bfe238cb0d0b29375f9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -971,6 +971,8 @@ public class PurpurWorldConfig {

patches/server/0164-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch

@@ -20,7 +20,7 @@ index 478b78c2c293d9f724d98ef3d600f52bac4890d4..aaee3f187616d78b98f1b0661ff1d891
          } else {
              Vec3 vec3d = player.getViewVector(1.0F).normalize();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 24798c3bfd17ba8383720d759050b4c906543f39..e8d89decde672d92e8346e035537d18cc797c8d6 100644
+index 7229ab7701ca2cfcf9690bfe238cb0d0b29375f9..7bd10666cdd3055d164cb14f32756d321ba462ce 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -973,6 +973,8 @@ public class PurpurWorldConfig {

patches/server/0165-Tick-fluids-config.patch

@@ -36,7 +36,7 @@ index 087601ffdeea97ec4cbb9959607bdcbcbae7c6fa..ad24daa0c727df15dbe0549036290a6c
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 819addfb7e9580ce7f95f08153c41cfd1350efef..6787eebe7aa1c928d8af66ce2ba2b569b4bfa300 100644
+index 7bd10666cdd3055d164cb14f32756d321ba462ce..45337e6425d8d7ceb97a6676e16986d62aaf6595 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -414,6 +414,7 @@ public class PurpurWorldConfig {

patches/server/0166-Config-to-disable-Llama-caravans.patch

@@ -32,7 +32,7 @@ index 088bfe0df138ff77ba09aa47e262542b8aaa404b..ddef9b81c20b28cf8d8eebcbe7f4a703
          this.caravanHead.caravanTail = this;
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0ad39778c5ec508091e27fbffe1cc85503df8cf5..cf6958e8cce679cb992510da94aaea369051b399 100644
+index 45337e6425d8d7ceb97a6676e16986d62aaf6595..a651d72bfeb1425b13c2c80d6088a506eb4abb1d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1266,6 +1266,7 @@ public class PurpurWorldConfig {

patches/server/0167-Config-to-make-Creepers-explode-on-death.patch

@@ -50,7 +50,7 @@ index 10095acd7b5b0b6e4e74192bb3d74ae2091aa75f..a9f3aec907798c0ce9bb684cdea8ab41
  
      private void spawnLingeringCloud() {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index cf6958e8cce679cb992510da94aaea369051b399..817f6a8e3b301e25d5748d53247478d83616cc1e 100644
+index a651d72bfeb1425b13c2c80d6088a506eb4abb1d..6fd4f5ea8595a88f1ecf96f9212b1b7a7112f2ae 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -835,6 +835,7 @@ public class PurpurWorldConfig {

patches/server/0168-Configurable-ravager-griefable-blocks-list.patch

@@ -31,7 +31,7 @@ index 3c51e6d419a244b9270119590aa299527163c331..b466b0430dd94777975a1e7ab9792166
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 817f6a8e3b301e25d5748d53247478d83616cc1e..b11be182547329bd3e5c03fbd6ca62ae86f1f2a5 100644
+index 6fd4f5ea8595a88f1ecf96f9212b1b7a7112f2ae..8396ecb2d4745ec64b60d8a553116e2296d4f588 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1606,6 +1606,7 @@ public class PurpurWorldConfig {

patches/server/0169-Sneak-to-bulk-process-composter.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Sneak to bulk process composter
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 8975a806979ac028b916b826e0d051af5e760550..d13a237319c2a581ab9300f16accc722116cba5a 100644
+index 12998d0e9ae0e148a155faa4468b0f78b8462cc9..04d94ae2d314dd24a92a4ddd93b81c7e1f8054ad 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -582,7 +582,7 @@ public class ServerPlayerGameMode {
@@ -75,7 +75,7 @@ index 4c9ae6bdb2f0358798f84928271a2d783dcba7b4..47bf769a031ae39cc72d2191195d1378
          int i = (Integer) iblockdata.getValue(ComposterBlock.LEVEL);
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e30ede9fa58b626b04334b7346390498e57fd412..28c943c1632174d4ae2a13039d2eb619a56bc644 100644
+index 8396ecb2d4745ec64b60d8a553116e2296d4f588..981b3f1fa76842a80837b5277fc037a3d8b4d77d 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -498,6 +498,11 @@ public class PurpurWorldConfig {

patches/server/0170-Config-for-skipping-night.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Config for skipping night
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 85b3ffb58b06ff6342abdd8948c1607079c4ee8f..40b9ce197be14894610673832752b8759fabd0da 100644
+index 069d98dd18713d7dd306b7a74b62ab7735da0a6a..6d43ad60dd374366d675b52e5b5e958b0cb1e1e2 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -716,7 +716,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -18,7 +18,7 @@ index 85b3ffb58b06ff6342abdd8948c1607079c4ee8f..40b9ce197be14894610673832752b875
              long l = this.levelData.getDayTime() + 24000L;
              TimeSkipEvent event = new TimeSkipEvent(this.getWorld(), TimeSkipEvent.SkipReason.NIGHT_SKIP, (l - l % 24000L) - this.getDayTime());
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 28c943c1632174d4ae2a13039d2eb619a56bc644..f20157b4bde76c563593e4d65cee63c49584953f 100644
+index 981b3f1fa76842a80837b5277fc037a3d8b4d77d..bac79479f426d306a93522e602fd8ca2ccf1807f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -312,6 +312,7 @@ public class PurpurWorldConfig {

patches/server/0171-Add-config-for-villager-trading.patch

@@ -31,7 +31,7 @@ index e5b78c9d6fb326771d65ea9afd9da38c204922f0..1a8df13b06b1ac5e5a7d63033b4a5326
                      this.openTradingScreen(player, this.getDisplayName(), 1);
                  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 433e72f93387625efe29db14a808db6078732e82..84b88a27f70e0cea75eadd51c82d90bc2ab003f2 100644
+index bac79479f426d306a93522e602fd8ca2ccf1807f..1421b73469da469d66818733f75f0073b06fa00b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1980,6 +1980,7 @@ public class PurpurWorldConfig {

patches/server/0172-Allow-infinity-on-crossbows.patch

@@ -65,7 +65,7 @@ index 6f6106ca4d74d50a7b74b086adc96c58c7906cb6..d6417c1e77ac8823e18a179dc9f61757
  
      public abstract boolean canEnchant(Item item);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 9b688f88e319d59724d923a1e2631879c3104ef4..04d307b09a03f67a3b2fe78be9470a8d3bb0b424 100644
+index 1e09dc436ce147d42035d48918b811eb7e898c12..8223f12a2457cd3dddff4f77e4fba1406e68889e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -272,6 +272,7 @@ public class PurpurConfig {

patches/server/0173-Drowning-Settings.patch

@@ -49,7 +49,7 @@ index b2dbe65f07ecc25be810f80aaf05d924c998dfac..7980fcfeb6e7a7ec32082cfb2879ff6d
                  }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7aa41a254a4ccc185af997e3d6515187e83f2db4..4d2559ab69df36261034c99669f144cc8385e976 100644
+index 1421b73469da469d66818733f75f0073b06fa00b..5b7ce7a99cf41bae9508564a36394527a87a4372 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -122,6 +122,15 @@ public class PurpurWorldConfig {

patches/server/0174-Break-individual-slabs-when-sneaking.patch

@@ -47,7 +47,7 @@ index eb7f8907bb362c0461194bbaf62917ce71c669f3..89f5e0d26500f1806dff9f91390546cd
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4d2559ab69df36261034c99669f144cc8385e976..92af920850b4976eae72572fd9cb118b8a020819 100644
+index 5b7ce7a99cf41bae9508564a36394527a87a4372..4dba41afcc59a2151c01799bcaff1b08820cfb14 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -632,6 +632,11 @@ public class PurpurWorldConfig {

patches/server/0175-Config-to-disable-hostile-mob-spawn-on-ice.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Config to disable hostile mob spawn on ice
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Monster.java b/src/main/java/net/minecraft/world/entity/monster/Monster.java
-index fc34cfa8bfb3b82a8e1b28d261f0e901d837467e..35d47bb0d8c4a2b8374564133f040899680efc0b 100644
+index 229490d3857ce9f5bba4e6bb4aedcff50b510ed9..e94618f4c1552bb1ef20067aa3201c6574b5c307 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Monster.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Monster.java
 @@ -87,6 +87,12 @@ public abstract class Monster extends PathfinderMob implements Enemy {
@@ -22,7 +22,7 @@ index fc34cfa8bfb3b82a8e1b28d261f0e901d837467e..35d47bb0d8c4a2b8374564133f040899
              return false;
          } else {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 6014c801897848f6a5edf133882995bebfe34693..366144207f5891f8caa2a00e213ca6ece439d1d7 100644
+index 4dba41afcc59a2151c01799bcaff1b08820cfb14..daca8b689c2510404f062a35a94c935aa304e6ec 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -577,8 +577,12 @@ public class PurpurWorldConfig {

patches/server/0176-Config-to-show-Armor-Stand-arms-on-spawn.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Config to show Armor Stand arms on spawn
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
-index d119f8ab447bc17deabc494463de496161c9b126..c9a44a4765f43b9c0247ed1005f4c13469bdee95 100644
+index aee5db3cdbc49de995780d0b0e219d0878a5f304..31454b15a20e0484e21c25ffb80d4d536e2ecc0b 100644
 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java
 @@ -114,6 +114,7 @@ public class ArmorStand extends LivingEntity {
@@ -17,7 +17,7 @@ index d119f8ab447bc17deabc494463de496161c9b126..c9a44a4765f43b9c0247ed1005f4c134
  
      public ArmorStand(Level world, double x, double y, double z) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 366144207f5891f8caa2a00e213ca6ece439d1d7..33dfdbdcdb344851431fb8786796784202e3aff1 100644
+index daca8b689c2510404f062a35a94c935aa304e6ec..09d47cffb5070e99ca941dd88dfc495b17d65ac7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -106,6 +106,7 @@ public class PurpurWorldConfig {

patches/server/0177-Option-to-make-doors-require-redstone.patch

@@ -67,7 +67,7 @@ index c903a1a8d2234bb0fa354d1c44ff3ab2275b04c7..d01e4064a772710c1383927e0848b9b3
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 33dfdbdcdb344851431fb8786796784202e3aff1..2e095d14a7fe54774d4046d80dae9cd7a405dc28 100644
+index 09d47cffb5070e99ca941dd88dfc495b17d65ac7..da526812eb623343cd5aea849c4439414a9d6569 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -523,6 +523,16 @@ public class PurpurWorldConfig {

patches/server/0178-Config-to-allow-for-unsafe-enchants.patch

@@ -75,7 +75,7 @@ index d1b4fe830170ddee2b6f39eba29e7068e6ae37a3..115f8eb919e90bc4a79db1d0f7875a31
          this.getOrCreateTag().put(key, tag);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 04d307b09a03f67a3b2fe78be9470a8d3bb0b424..53a54fea80099e8e97f17ba3fc2445f02364bb35 100644
+index 8223f12a2457cd3dddff4f77e4fba1406e68889e..6ba0d86496a73f90cfdab9fd6ff871cb6f286a8a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -273,6 +273,7 @@ public class PurpurConfig {

patches/server/0179-Configurable-sponge-absorption.patch

@@ -43,7 +43,7 @@ index 1ef8eadd4e59f2e5d2bbd84f6f9bcf37b59db5bd..5b10e1110f938745c8f9ed0b55960566
              }
          }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2fe3b219be4f3f49fe9ee28349dddcee92dfa2c9..4b7ac91429de76a61be6de53275115d76213e7a3 100644
+index da526812eb623343cd5aea849c4439414a9d6569..de88b4dc9860c386a2b407bc2703c08958433624 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -658,6 +658,13 @@ public class PurpurWorldConfig {

patches/server/0180-Projectile-offset-config.patch

@@ -96,7 +96,7 @@ index 3f53dc8f250ad3f7616ce7ef0a2353caa0ab1879..29130aa9673a3956030f3e43b784ac46
                                  entitythrowntrident.pickup = AbstractArrow.Pickup.CREATIVE_ONLY;
                              }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index bd7ce307864ae535024c1fa4621ecbeb04dea9d8..9d187f13fcb0f504f16249d99e872dfd56f8c822 100644
+index de88b4dc9860c386a2b407bc2703c08958433624..9aa4a8f8cca73c2c16052ba12ee421ddaa0b9e2f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -381,6 +381,23 @@ public class PurpurWorldConfig {

patches/server/0181-Config-for-powered-rail-activation-distance.patch

@@ -18,7 +18,7 @@ index 7fddb6fa8fd30ef88346a59f7867aae792f13772..40893e71fe8447b695350273bef9623b
          } else {
              int j = pos.getX();
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index fc864f67a32cea9f52dfaaed6ec539cc9446c2c4..2d63a25e574fde7fe5694e9e49d7cd1602061365 100644
+index 9aa4a8f8cca73c2c16052ba12ee421ddaa0b9e2f..b6e75495e61d2d22224eb6faa5f5bd087b22799f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -670,6 +670,11 @@ public class PurpurWorldConfig {

patches/server/0182-Piglin-portal-spawn-modifier.patch

@@ -31,7 +31,7 @@ index fef1027829c44957e23c0a121033bfb7640d06f0..c42349d0f6b0025525278295b36f4030
                  pos = pos.below();
              }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 5718fd563eabdcdd8d85375bd31d979961a87c21..af8468fb7ea5327dac2c1aa53c9ba5f3efd92606 100644
+index b6e75495e61d2d22224eb6faa5f5bd087b22799f..f054153986dfc9b1e214b75409a216d60435d8a9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1559,6 +1559,7 @@ public class PurpurWorldConfig {

patches/server/0183-Config-to-change-max-number-of-bees.patch

@@ -18,7 +18,7 @@ index 8484e80a70129fb0358d56efab6fd54798b54e6e..ffacc4b8cc3ab8285c4131aec58e48ff
      public BeehiveBlockEntity(BlockPos pos, BlockState state) {
          super(BlockEntityType.BEEHIVE, pos, state);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 53a54fea80099e8e97f17ba3fc2445f02364bb35..154ba82f0f94150d980e62d9441a5d6d137cee43 100644
+index 6ba0d86496a73f90cfdab9fd6ff871cb6f286a8a..62e741b78c70fd755c0e083bb510d621d0f3802e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -238,6 +238,7 @@ public class PurpurConfig {

patches/server/0184-Configurable-damage-settings-for-magma-blocks.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable damage settings for magma blocks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ce57f04a3e8395b90a46c50cab0b0cd6ecf8b3c2..8b7732ad47feddaf66f7db998a9ccbecea43d53b 100644
+index 3a010a01c6cfd5307b1856bb9d70e81cabe45a65..d3d6dc230674a4c6f9c388b131e1feb42660d865 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1035,7 +1035,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -31,7 +31,7 @@ index 5d844ed98b916298a657d5e9766ab7f383a304e0..0129460ce1ca199a47b6657f824c75fd
              entity.hurt(DamageSource.HOT_FLOOR, 1.0F);
              org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = null; // CraftBukkit
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f7c285f84bbe635464f96d0045dfd3dcda33180b..262ea71d4b578a42b319939d7eb20b18e5ba4f61 100644
+index f054153986dfc9b1e214b75409a216d60435d8a9..90b87383f5b1e6db87b80148f672300c2bfd8ad0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -637,6 +637,13 @@ public class PurpurWorldConfig {

patches/server/0185-Config-for-wither-explosion-radius.patch

@@ -18,7 +18,7 @@ index 430aa10101d9f21561155941ff24441fd0c4103a..de91f0dd7f9a62e5a96b4cc3e4f505ec
  
              if (!event.isCancelled()) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a3ef14db546b3175938d834c74fb3da6a70199e0..5b62f0bd78c38dfd174c93bf4198c6b28b499aef 100644
+index 90b87383f5b1e6db87b80148f672300c2bfd8ad0..f3a339284d3a8eb9baa856cc969a407e1fc2aac4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -2145,6 +2145,7 @@ public class PurpurWorldConfig {

patches/server/0186-Gamemode-extra-permissions.patch

@@ -54,7 +54,7 @@ index 79f6089b934124c3309c6bee2e48b36b937252e0..dff8ef0a1a2e52792070d93685c29002
  
          for(ServerPlayer serverPlayer : targets) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 154ba82f0f94150d980e62d9441a5d6d137cee43..420a3fb44eb50147d070953b7107517baa4e5df9 100644
+index 62e741b78c70fd755c0e083bb510d621d0f3802e..7c108355943d71531ec7a9a997b10dc6959de09b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -221,6 +221,7 @@ public class PurpurConfig {

patches/server/0187-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch

@@ -18,7 +18,7 @@ index e5562b407bba35ab93bf8bc3c22ac9d45e8353cb..c688bb73cd062f36524cfc231cb691f2
              if (blockState2 != null && level.getBlockState(blockPos.above()).isAir()) {
                  level.playSound(player, blockPos, SoundEvents.SHOVEL_FLATTEN, SoundSource.BLOCKS, 1.0F, 1.0F);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4cfe4bb07f995ef52bda097e3247719c605e5de5..df34f0b8cc56004e19c25aadc523b900229f88b1 100644
+index f3a339284d3a8eb9baa856cc969a407e1fc2aac4..d8039612d92e25ac9667e513206db17ccd53b9e4 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -398,6 +398,21 @@ public class PurpurWorldConfig {

patches/server/0188-Configurable-piston-push-limit.patch

@@ -36,7 +36,7 @@ index 744d91546d1a810f60a43c15ed74b4158f341a4a..354538daefa603f6df5a139b6bff87db
                      }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f91140cbc05330085228a13a89815705f3e7eeac..69a507c77808cfd892ebe0658ba2fbb3ed526e0a 100644
+index d8039612d92e25ac9667e513206db17ccd53b9e4..23d2d6e34e33ca53f7867e2a301e75dffea74704 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -659,6 +659,11 @@ public class PurpurWorldConfig {

patches/server/0189-Configurable-broadcast-settings.patch

@@ -17,7 +17,7 @@ index c46df052a5a39d92688f51377ee1f7b5b5b36faa..d7d2a975386cecb0d50b4f7ed37de8ad
                      // Paper end
                  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index f83e5b3ee2489b4dd35f856a1262972939eb71cf..b599607d616f9faf209f1a4491dd3fcfd49a6126 100644
+index af22f5b80fd8d7aba8d12d84196a57e8f054fec2..674c6ffbec5874d3581d3d02683d9e5c38bff269 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -881,6 +881,7 @@ public class ServerPlayer extends Player {
@@ -29,7 +29,7 @@ index f83e5b3ee2489b4dd35f856a1262972939eb71cf..b599607d616f9faf209f1a4491dd3fcf
                  if (scoreboardteambase.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) {
                      this.server.getPlayerList().broadcastToTeam((Player) this, ichatbasecomponent);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 7e74166e12c114330a99365440d09ee7eb6023dc..ffa8fc634e46e5bbd2f97fb4d1167cacd82b3164 100644
+index 7c108355943d71531ec7a9a997b10dc6959de09b..4d09b8eb877954537abe5ba165a1e35194443341 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -178,6 +178,18 @@ public class PurpurConfig {

patches/server/0191-Configurable-mob-blindness.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable mob blindness
 Ported from https://github.com/raltsmc/mobblindness
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index fe0e0670fce56f96a7d9204ca20a483ad709493a..d1237c85995d3aab5d9a664db6b6ef32fe10b439 100644
+index 7980fcfeb6e7a7ec32082cfb2879ff6d5480d1a2..e1308770c3510f54da40b2ff38d08186bac22518 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -991,6 +991,17 @@ public abstract class LivingEntity extends Entity {
@@ -28,7 +28,7 @@ index fe0e0670fce56f96a7d9204ca20a483ad709493a..d1237c85995d3aab5d9a664db6b6ef32
  
          return d0;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 7910a07cb6f3d03ced57a4dddbd0e06c457e629e..2aab50eb3e27ffd932960605cfb2016deb1eaad6 100644
+index 23d2d6e34e33ca53f7867e2a301e75dffea74704..5278ac38778ab8fd74baf5b19211477f204b1bb9 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -460,6 +460,7 @@ public class PurpurWorldConfig {

patches/server/0192-Hide-hidden-players-from-entity-selector.patch

@@ -59,7 +59,7 @@ index 0fb8f32427843f4bfd90ab88ecb3ab3e4a4fda31..f99f1ba7f912a2fd503e12c446b342a8
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index ae258c4eaa402cc246d7a7052965ce06c58554f0..238a33ff3fc9d70a625fec5c37ec83ccbe05792f 100644
+index 4d09b8eb877954537abe5ba165a1e35194443341..d9a818087f56237e0f31cf801c421ccc8dd6147e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -234,6 +234,7 @@ public class PurpurConfig {