From 59439785d95f9863d2fb008e6e61ce68afc69643 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <blake.galbreath@gmail.com>
Date: Wed, 9 Dec 2020 19:36:38 -0600
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
cc0494817 Tick inactive goal selectors
c19ec6394 fix 4878 by always calling events using bukkit singleton
5d216be1d Fix MC-181190 curing zombie villager discount exploit (#4871)
---
 Paper                                         |  2 +-
 current-paper                                 |  2 +-
 .../server/0001-Tuinity-Server-Changes.patch  |  4 +-
 patches/server/0028-Giants-AI-settings.patch  |  8 ++--
 ...up-loot-bypass-mob-griefing-gamerule.patch |  4 +-
 ...Projectile-load-save-limit-per-chunk.patch |  8 ++--
 ...ispenser-curse-of-binding-protection.patch |  4 +-
 patches/server/0092-Entity-lifespan.patch     | 12 +++---
 ...set-reputation-when-villager-is-cure.patch | 43 -------------------
 ...patch => 0111-Short-enderman-height.patch} |  0
 ...top-squids-floating-on-top-of-water.patch} |  2 +-
 ...114-Ridables.patch => 0113-Ridables.patch} | 17 ++++----
 ...-height-for-nether-surface-builders.patch} |  0
 ...ng-obsidian-valid-for-portal-frames.patch} |  0
 ...ities-can-use-portals-configuration.patch} |  2 +-
 ...117-LivingEntity-broadcastItemBreak.patch} |  0
 ...zable-WitherBoss-Health-and-Healing.patch} |  2 +-
 ...gling-special-MobSpawners-per-world.patch} |  2 +-
 ...patch => 0120-Raid-cooldown-setting.patch} |  2 +-
 ...-config-options-per-projectile-type.patch} |  2 +-
 ...olor-code-support-for-console-loggi.patch} |  0
 ...able-zombie-aggressiveness-towards-.patch} |  2 +-
 ...ent-TileEntity-Lore-and-DisplayName.patch} |  2 +-
 ...-to-recipe-s-ExactChoice-ingredient.patch} |  0
 ...y.patch => 0126-Flying-squids-Oh-my.patch} |  2 +-
 ...patch => 0127-Infinity-bow-settings.patch} |  2 +-
 ...ge.patch => 0128-Stonecutter-damage.patch} |  2 +-
 ...=> 0129-Configurable-daylight-cycle.patch} |  2 +-
 ...e-and-mending-enchantments-together.patch} |  0
 ...patch => 0131-Infinite-fuel-furnace.patch} |  2 +-
 ...ws-should-not-reset-despawn-counter.patch} |  0
 ...3-Add-tablist-suffix-option-for-afk.patch} |  2 +-
 ...e-add-farmland-mechanics-from-Alpha.patch} |  2 +-
 ...ustable-breeding-cooldown-to-config.patch} |  2 +-
 ...-animal-breeding-times-configurable.patch} |  2 +-
 ...es-from-item-forms-of-entities-to-e.patch} |  8 ++--
 ...when-using-a-Name-Tag-on-an-Armor-S.patch} |  2 +-
 ...ting-and-weeping-vines-growth-rates.patch} |  2 +-
 ...twisting-vines-configurable-max-gro.patch} |  2 +-
 ...lowing-Endermen-to-despawn-even-whi.patch} |  2 +-
 ...check-to-EntityDamagedByEntityEvent.patch} |  0
 ...43-Add-configurable-snowball-damage.patch} |  2 +-
 ...reak-door-minimum-difficulty-option.patch} |  2 +-
 ...mand.patch => 0145-Add-demo-command.patch} |  0
 ...d-API.patch => 0146-Left-handed-API.patch} |  0
 ...i-Fix-ProtocolLib-issues-on-Java-15.patch} |  0
 ...8-Changeable-Mob-Left-Handed-Chance.patch} |  6 +--
 ...=> 0149-Add-boat-fall-damage-config.patch} |  4 +-
 ...disable-saving-projectiles-to-disk-.patch} |  2 +-
 ...0151-Snow-Golem-rate-of-fire-config.patch} |  2 +-
 ...52-PaperPR-Apply-advancements-async.patch} |  2 +-
 ...-option-for-Piglins-guarding-chests.patch} |  2 +-
 ...-Configurable-disable-give-dropping.patch} |  0
 ...climbing-should-not-bypass-cramming.patch} |  2 +-
 ...x-drops-when-curing-zombie-villager.patch} |  9 ++--
 ... => 0157-Lobotomize-stuck-villagers.patch} |  4 +-
 ...illager-Clerics-to-farm-Nether-Wart.patch} |  4 +-
 ...ied-Piglin-death-always-counting-as.patch} |  2 +-
 ...-out-and-optimise-player-list-ticks.patch} |  0
 ... => 0161-Wolf-naturally-spawn-rabid.patch} |  2 +-
 60 files changed, 77 insertions(+), 122 deletions(-)
 delete mode 100644 patches/server/0111-Add-option-to-reset-reputation-when-villager-is-cure.patch
 rename patches/server/{0112-Short-enderman-height.patch => 0111-Short-enderman-height.patch} (100%)
 rename patches/server/{0113-Stop-squids-floating-on-top-of-water.patch => 0112-Stop-squids-floating-on-top-of-water.patch} (98%)
 rename patches/server/{0114-Ridables.patch => 0113-Ridables.patch} (99%)
 rename patches/server/{0115-Use-configured-height-for-nether-surface-builders.patch => 0114-Use-configured-height-for-nether-surface-builders.patch} (100%)
 rename patches/server/{0116-Crying-obsidian-valid-for-portal-frames.patch => 0115-Crying-obsidian-valid-for-portal-frames.patch} (100%)
 rename patches/server/{0117-Entities-can-use-portals-configuration.patch => 0116-Entities-can-use-portals-configuration.patch} (98%)
 rename patches/server/{0118-LivingEntity-broadcastItemBreak.patch => 0117-LivingEntity-broadcastItemBreak.patch} (100%)
 rename patches/server/{0119-Customizable-WitherBoss-Health-and-Healing.patch => 0118-Customizable-WitherBoss-Health-and-Healing.patch} (99%)
 rename patches/server/{0120-Allow-toggling-special-MobSpawners-per-world.patch => 0119-Allow-toggling-special-MobSpawners-per-world.patch} (99%)
 rename patches/server/{0121-Raid-cooldown-setting.patch => 0120-Raid-cooldown-setting.patch} (99%)
 rename patches/server/{0122-Despawn-rate-config-options-per-projectile-type.patch => 0121-Despawn-rate-config-options-per-projectile-type.patch} (99%)
 rename patches/server/{0123-PaperPR-Add-hex-color-code-support-for-console-loggi.patch => 0122-PaperPR-Add-hex-color-code-support-for-console-loggi.patch} (100%)
 rename patches/server/{0124-Add-option-to-disable-zombie-aggressiveness-towards-.patch => 0123-Add-option-to-disable-zombie-aggressiveness-towards-.patch} (99%)
 rename patches/server/{0125-Persistent-TileEntity-Lore-and-DisplayName.patch => 0124-Persistent-TileEntity-Lore-and-DisplayName.patch} (99%)
 rename patches/server/{0126-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch => 0125-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch} (100%)
 rename patches/server/{0127-Flying-squids-Oh-my.patch => 0126-Flying-squids-Oh-my.patch} (98%)
 rename patches/server/{0128-Infinity-bow-settings.patch => 0127-Infinity-bow-settings.patch} (98%)
 rename patches/server/{0129-Stonecutter-damage.patch => 0128-Stonecutter-damage.patch} (98%)
 rename patches/server/{0130-Configurable-daylight-cycle.patch => 0129-Configurable-daylight-cycle.patch} (99%)
 rename patches/server/{0131-Allow-infinite-and-mending-enchantments-together.patch => 0130-Allow-infinite-and-mending-enchantments-together.patch} (100%)
 rename patches/server/{0132-Infinite-fuel-furnace.patch => 0131-Infinite-fuel-furnace.patch} (98%)
 rename patches/server/{0133-Arrows-should-not-reset-despawn-counter.patch => 0132-Arrows-should-not-reset-despawn-counter.patch} (100%)
 rename patches/server/{0134-Add-tablist-suffix-option-for-afk.patch => 0133-Add-tablist-suffix-option-for-afk.patch} (98%)
 rename patches/server/{0135-Ability-to-re-add-farmland-mechanics-from-Alpha.patch => 0134-Ability-to-re-add-farmland-mechanics-from-Alpha.patch} (98%)
 rename patches/server/{0136-Add-adjustable-breeding-cooldown-to-config.patch => 0135-Add-adjustable-breeding-cooldown-to-config.patch} (99%)
 rename patches/server/{0137-Make-animal-breeding-times-configurable.patch => 0136-Make-animal-breeding-times-configurable.patch} (99%)
 rename patches/server/{0138-Apply-display-names-from-item-forms-of-entities-to-e.patch => 0137-Apply-display-names-from-item-forms-of-entities-to-e.patch} (98%)
 rename patches/server/{0139-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch => 0138-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch} (98%)
 rename patches/server/{0140-Add-twisting-and-weeping-vines-growth-rates.patch => 0139-Add-twisting-and-weeping-vines-growth-rates.patch} (99%)
 rename patches/server/{0141-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch => 0140-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch} (99%)
 rename patches/server/{0142-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch => 0141-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch} (98%)
 rename patches/server/{0143-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch => 0142-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch} (100%)
 rename patches/server/{0144-Add-configurable-snowball-damage.patch => 0143-Add-configurable-snowball-damage.patch} (98%)
 rename patches/server/{0145-Zombie-break-door-minimum-difficulty-option.patch => 0144-Zombie-break-door-minimum-difficulty-option.patch} (99%)
 rename patches/server/{0146-Add-demo-command.patch => 0145-Add-demo-command.patch} (100%)
 rename patches/server/{0147-Left-handed-API.patch => 0146-Left-handed-API.patch} (100%)
 rename patches/server/{0148-Origami-Fix-ProtocolLib-issues-on-Java-15.patch => 0147-Origami-Fix-ProtocolLib-issues-on-Java-15.patch} (100%)
 rename patches/server/{0149-Changeable-Mob-Left-Handed-Chance.patch => 0148-Changeable-Mob-Left-Handed-Chance.patch} (93%)
 rename patches/server/{0150-Add-boat-fall-damage-config.patch => 0149-Add-boat-fall-damage-config.patch} (97%)
 rename patches/server/{0151-Config-migration-disable-saving-projectiles-to-disk-.patch => 0150-Config-migration-disable-saving-projectiles-to-disk-.patch} (98%)
 rename patches/server/{0152-Snow-Golem-rate-of-fire-config.patch => 0151-Snow-Golem-rate-of-fire-config.patch} (98%)
 rename patches/server/{0153-PaperPR-Apply-advancements-async.patch => 0152-PaperPR-Apply-advancements-async.patch} (99%)
 rename patches/server/{0154-PaperPR-Config-option-for-Piglins-guarding-chests.patch => 0153-PaperPR-Config-option-for-Piglins-guarding-chests.patch} (97%)
 rename patches/server/{0155-EMC-Configurable-disable-give-dropping.patch => 0154-EMC-Configurable-disable-give-dropping.patch} (100%)
 rename patches/server/{0156-Config-migration-climbing-should-not-bypass-cramming.patch => 0155-Config-migration-climbing-should-not-bypass-cramming.patch} (98%)
 rename patches/server/{0157-Fix-drops-when-curing-zombie-villager.patch => 0156-Fix-drops-when-curing-zombie-villager.patch} (84%)
 rename patches/server/{0158-Lobotomize-stuck-villagers.patch => 0157-Lobotomize-stuck-villagers.patch} (98%)
 rename patches/server/{0159-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch => 0158-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch} (99%)
 rename patches/server/{0160-Toggle-for-Zombified-Piglin-death-always-counting-as.patch => 0159-Toggle-for-Zombified-Piglin-death-always-counting-as.patch} (98%)
 rename patches/server/{0161-Spread-out-and-optimise-player-list-ticks.patch => 0160-Spread-out-and-optimise-player-list-ticks.patch} (100%)
 rename patches/server/{0162-Wolf-naturally-spawn-rabid.patch => 0161-Wolf-naturally-spawn-rabid.patch} (99%)

diff --git a/Paper b/Paper
index 3dc82c200..cc0494817 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit 3dc82c2008a584ff41355d208cbc1a993c436b6b
+Subproject commit cc0494817694a705bfd6a06218ccdf3881fa8566
diff --git a/current-paper b/current-paper
index 98a688bd7..aafdc0085 100644
--- a/current-paper
+++ b/current-paper
@@ -1 +1 @@
-1.16.4--de075fa8d03437e6e01d115ec6dea1ac7cbbced2
+1.16.4--3a5de1207a384d66b0a3cf46c5baa0633839cc53
diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch
index 57a3d8267..577596d4b 100644
--- a/patches/server/0001-Tuinity-Server-Changes.patch
+++ b/patches/server/0001-Tuinity-Server-Changes.patch
@@ -8328,10 +8328,10 @@ index 957a351c3f..57166a543a 100644
              this.setPersistent();
          }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 7ddf276732..23007c9ccb 100644
+index dcc5b098bf..7b32a1fb79 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -707,7 +707,13 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -709,7 +709,13 @@ public abstract class EntityInsentient extends EntityLiving {
          if (this.world.getDifficulty() == EnumDifficulty.PEACEFUL && this.L()) {
              this.die();
          } else if (!this.isPersistent() && !this.isSpecialPersistence()) {
diff --git a/patches/server/0028-Giants-AI-settings.patch b/patches/server/0028-Giants-AI-settings.patch
index 368381822..10a8a3358 100644
--- a/patches/server/0028-Giants-AI-settings.patch
+++ b/patches/server/0028-Giants-AI-settings.patch
@@ -112,10 +112,10 @@ index 9f4f56c47e..8dce2aad77 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 23007c9ccb..ba4a2bcfa0 100644
+index 7b32a1fb79..b281ca841b 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -946,6 +946,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -948,6 +948,7 @@ public abstract class EntityInsentient extends EntityLiving {
          return f;
      }
  
@@ -123,7 +123,7 @@ index 23007c9ccb..ba4a2bcfa0 100644
      protected void a(DifficultyDamageScaler difficultydamagescaler) {
          if (this.random.nextFloat() < 0.15F * difficultydamagescaler.d()) {
              int i = this.random.nextInt(2);
-@@ -1053,6 +1054,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1055,6 +1056,7 @@ public abstract class EntityInsentient extends EntityLiving {
          }
      }
  
@@ -131,7 +131,7 @@ index 23007c9ccb..ba4a2bcfa0 100644
      protected void b(DifficultyDamageScaler difficultydamagescaler) {
          float f = difficultydamagescaler.d();
  
-@@ -1094,10 +1096,12 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1096,10 +1098,12 @@ public abstract class EntityInsentient extends EntityLiving {
          } else {
              this.setLeftHanded(false);
          }
diff --git a/patches/server/0064-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch b/patches/server/0064-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
index 894e6aada..b3d737cb1 100644
--- a/patches/server/0064-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
+++ b/patches/server/0064-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entities pick up loot bypass mob-griefing gamerule
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index ba4a2bcfa0..b71dea314c 100644
+index b281ca841b..23d5d1f0a5 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -542,7 +542,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -544,7 +544,7 @@ public abstract class EntityInsentient extends EntityLiving {
      public void movementTick() {
          super.movementTick();
          this.world.getMethodProfiler().enter("looting");
diff --git a/patches/server/0072-PaperPR-Projectile-load-save-limit-per-chunk.patch b/patches/server/0072-PaperPR-Projectile-load-save-limit-per-chunk.patch
index a476ae37f..47a526143 100644
--- a/patches/server/0072-PaperPR-Projectile-load-save-limit-per-chunk.patch
+++ b/patches/server/0072-PaperPR-Projectile-load-save-limit-per-chunk.patch
@@ -9,12 +9,12 @@ that 5 arrows, 5 snowballs, 5 tridents, etc. will be allowed to be
 saved/loaded per chunk. The default value of -1 disables the limit.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 5596d9f425..5ffc5af1de 100644
+index ae5ed3bd0b..2452f54d96 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -704,4 +704,9 @@ public class PaperWorldConfig {
-     private void fixClimbingBypassingCrammingRule() {
-         fixClimbingBypassingCrammingRule = getBoolean("fix-climbing-bypassing-cramming-rule", fixClimbingBypassingCrammingRule);
+@@ -709,4 +709,9 @@ public class PaperWorldConfig {
+     private void fixCuringExploit() {
+         fixCuringZombieVillagerDiscountExploit = getBoolean("game-mechanics.fix-curing-zombie-villager-discount-exploit", fixCuringZombieVillagerDiscountExploit);
      }
 +
 +    public int projectileSaveLimit = -1;
diff --git a/patches/server/0075-Dispenser-curse-of-binding-protection.patch b/patches/server/0075-Dispenser-curse-of-binding-protection.patch
index 66cb57755..33d8ac0f0 100644
--- a/patches/server/0075-Dispenser-curse-of-binding-protection.patch
+++ b/patches/server/0075-Dispenser-curse-of-binding-protection.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Dispenser curse of binding protection
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 84ac5112a2..202ccf2a7f 100644
+index 23eb697f3d..7a40f08646 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -992,6 +992,13 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -994,6 +994,13 @@ public abstract class EntityInsentient extends EntityLiving {
  
      }
  
diff --git a/patches/server/0092-Entity-lifespan.patch b/patches/server/0092-Entity-lifespan.patch
index 2f378c77b..9a0c730f7 100644
--- a/patches/server/0092-Entity-lifespan.patch
+++ b/patches/server/0092-Entity-lifespan.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entity lifespan
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 202ccf2a7f..2fcd7f461a 100644
+index 7a40f08646..1d5d87e619 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -53,7 +53,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -17,7 +17,7 @@ index 202ccf2a7f..2fcd7f461a 100644
      public boolean aware = true; // CraftBukkit
  
      protected EntityInsentient(EntityTypes<? extends EntityInsentient> entitytypes, World world) {
-@@ -203,6 +203,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -205,6 +205,7 @@ public abstract class EntityInsentient extends EntityLiving {
                  entityliving = null;
              }
          }
@@ -25,7 +25,7 @@ index 202ccf2a7f..2fcd7f461a 100644
          this.goalTarget = entityliving;
          return true;
          // CraftBukkit end
-@@ -246,10 +247,35 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -248,10 +249,35 @@ public abstract class EntityInsentient extends EntityLiving {
              this.m();
              this.F();
          }
@@ -62,7 +62,7 @@ index 202ccf2a7f..2fcd7f461a 100644
      @Override
      protected void c(DamageSource damagesource) {
          this.m();
-@@ -423,6 +449,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -425,6 +451,7 @@ public abstract class EntityInsentient extends EntityLiving {
          }
  
          nbttagcompound.setBoolean("Bukkit.Aware", this.aware); // CraftBukkit
@@ -70,7 +70,7 @@ index 202ccf2a7f..2fcd7f461a 100644
      }
  
      @Override
-@@ -493,6 +520,11 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -495,6 +522,11 @@ public abstract class EntityInsentient extends EntityLiving {
              this.aware = nbttagcompound.getBoolean("Bukkit.Aware");
          }
          // CraftBukkit end
@@ -82,7 +82,7 @@ index 202ccf2a7f..2fcd7f461a 100644
      }
  
      @Override
-@@ -1542,7 +1574,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1544,7 +1576,7 @@ public abstract class EntityInsentient extends EntityLiving {
              this.a((EntityLiving) this, entity);
              this.z(entity);
          }
diff --git a/patches/server/0111-Add-option-to-reset-reputation-when-villager-is-cure.patch b/patches/server/0111-Add-option-to-reset-reputation-when-villager-is-cure.patch
deleted file mode 100644
index fac742cb0..000000000
--- a/patches/server/0111-Add-option-to-reset-reputation-when-villager-is-cure.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Mon, 10 Aug 2020 13:54:05 -0500
-Subject: [PATCH] Add option to reset reputation when villager is cured
-
-
-diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 7cf6d4a4cd..5dd9e3bb20 100644
---- a/src/main/java/net/minecraft/server/EntityVillager.java
-+++ b/src/main/java/net/minecraft/server/EntityVillager.java
-@@ -39,7 +39,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
-     @Nullable
-     private EntityHuman bv;
-     private byte bx;
--    private final Reputation by;
-+    private Reputation by; // Purpur - remove final
-     private long bz;
-     private long bA;
-     private int bB;
-@@ -942,6 +942,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
-     @Override
-     public void a(ReputationEvent reputationevent, Entity entity) {
-         if (reputationevent == ReputationEvent.a) {
-+            if (world.purpurConfig.zombieVillagerResetReputationsWhenCured) this.by = new Reputation(); // Purpur
-             this.by.a(entity.getUniqueID(), ReputationType.MAJOR_POSITIVE, 20);
-             this.by.a(entity.getUniqueID(), ReputationType.MINOR_POSITIVE, 25);
-         } else if (reputationevent == ReputationEvent.e) {
-diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 226d64798f..a41cc6da74 100644
---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -543,9 +543,11 @@ public class PurpurWorldConfig {
-     public boolean zombieVillagerJockeyOnlyBaby = true;
-     public double zombieVillagerJockeyChance = 0.05D;
-     public boolean zombieVillagerJockeyTryExistingChickens = true;
-+    public boolean zombieVillagerResetReputationsWhenCured = false;
-     private void zombieVillagerSettings() {
-         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);
-+        zombieVillagerResetReputationsWhenCured = getBoolean("mobs.zombie_villager.reset-reputation-when-cured", zombieVillagerResetReputationsWhenCured);
-     }
- }
diff --git a/patches/server/0112-Short-enderman-height.patch b/patches/server/0111-Short-enderman-height.patch
similarity index 100%
rename from patches/server/0112-Short-enderman-height.patch
rename to patches/server/0111-Short-enderman-height.patch
diff --git a/patches/server/0113-Stop-squids-floating-on-top-of-water.patch b/patches/server/0112-Stop-squids-floating-on-top-of-water.patch
similarity index 98%
rename from patches/server/0113-Stop-squids-floating-on-top-of-water.patch
rename to patches/server/0112-Stop-squids-floating-on-top-of-water.patch
index 51c1c9ed6..254dc9bff 100644
--- a/patches/server/0113-Stop-squids-floating-on-top-of-water.patch
+++ b/patches/server/0112-Stop-squids-floating-on-top-of-water.patch
@@ -43,7 +43,7 @@ index b21605a623..148e4b1587 100644
      protected void initPathfinder() {
          this.goalSelector.a(0, new EntitySquid.PathfinderGoalSquid(this));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a41cc6da74..cf8f46d439 100644
+index 226d64798f..8d7da9fe0b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -482,8 +482,10 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0114-Ridables.patch b/patches/server/0113-Ridables.patch
similarity index 99%
rename from patches/server/0114-Ridables.patch
rename to patches/server/0113-Ridables.patch
index 8484241a6..fe110659c 100644
--- a/patches/server/0114-Ridables.patch
+++ b/patches/server/0113-Ridables.patch
@@ -2199,7 +2199,7 @@ index b6c6b4d54e..f5b6d83f87 100644
          this.targetSelector.a(2, (new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)).a(300));
          this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300));
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 2fcd7f461a..6952832458 100644
+index 1d5d87e619..80589799ab 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -29,7 +29,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -2222,7 +2222,7 @@ index 2fcd7f461a..6952832458 100644
          this.bi = new ControllerJump(this);
          this.c = this.r();
          this.navigation = this.b(world);
-@@ -254,10 +254,10 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -256,10 +256,10 @@ public abstract class EntityInsentient extends EntityLiving {
      // Purpur start
      private void incrementTicksSinceLastInteraction() {
          ++ticksSinceLastInteraction;
@@ -2237,7 +2237,7 @@ index 2fcd7f461a..6952832458 100644
          if (world.purpurConfig.entityLifeSpan <= 0) {
              return; // feature disabled
          }
-@@ -552,14 +552,17 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -554,14 +554,17 @@ public abstract class EntityInsentient extends EntityLiving {
          return super.dp();
      }
  
@@ -2255,7 +2255,7 @@ index 2fcd7f461a..6952832458 100644
      public void v(float f) {
          this.aR = f;
      }
-@@ -1248,7 +1251,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1250,7 +1253,7 @@ public abstract class EntityInsentient extends EntityLiving {
      protected void a(EntityHuman entityhuman, EntityInsentient entityinsentient) {}
  
      protected EnumInteractionResult b(EntityHuman entityhuman, EnumHand enumhand) {
@@ -2264,7 +2264,7 @@ index 2fcd7f461a..6952832458 100644
      }
  
      public boolean ev() {
-@@ -1620,4 +1623,54 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1622,4 +1625,54 @@ public abstract class EntityInsentient extends EntityLiving {
          this.world.getServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), UnleashReason.UNKNOWN)); // CraftBukkit
          this.unleash(true, false);
      }
@@ -4332,7 +4332,7 @@ index ed6a47ad2f..ac75ed3e2e 100644
                  Vec3D vec3d = new Vec3D(this.b - EntityVex.this.locX(), this.c - EntityVex.this.locY(), this.d - EntityVex.this.locZ());
                  double d0 = vec3d.f();
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 5dd9e3bb20..823155821b 100644
+index 5d37cb14f9..166a8f9a7f 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -75,8 +75,19 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -5070,7 +5070,7 @@ index 79fc12f499..0f981dc160 100644
  
      public static int dungeonSeed = -1;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index cf8f46d439..0bafbf52fb 100644
+index 8d7da9fe0b..2921619972 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -42,11 +42,6 @@ public class PurpurWorldConfig {
@@ -5611,7 +5611,7 @@ index cf8f46d439..0bafbf52fb 100644
          villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks);
          villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging);
          villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
-@@ -507,46 +870,109 @@ public class PurpurWorldConfig {
+@@ -507,45 +870,108 @@ public class PurpurWorldConfig {
          villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
      }
  
@@ -5714,7 +5714,6 @@ index cf8f46d439..0bafbf52fb 100644
      public boolean zombieVillagerJockeyOnlyBaby = true;
      public double zombieVillagerJockeyChance = 0.05D;
      public boolean zombieVillagerJockeyTryExistingChickens = true;
-     public boolean zombieVillagerResetReputationsWhenCured = false;
      private void zombieVillagerSettings() {
 +        zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
 +        zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
diff --git a/patches/server/0115-Use-configured-height-for-nether-surface-builders.patch b/patches/server/0114-Use-configured-height-for-nether-surface-builders.patch
similarity index 100%
rename from patches/server/0115-Use-configured-height-for-nether-surface-builders.patch
rename to patches/server/0114-Use-configured-height-for-nether-surface-builders.patch
diff --git a/patches/server/0116-Crying-obsidian-valid-for-portal-frames.patch b/patches/server/0115-Crying-obsidian-valid-for-portal-frames.patch
similarity index 100%
rename from patches/server/0116-Crying-obsidian-valid-for-portal-frames.patch
rename to patches/server/0115-Crying-obsidian-valid-for-portal-frames.patch
diff --git a/patches/server/0117-Entities-can-use-portals-configuration.patch b/patches/server/0116-Entities-can-use-portals-configuration.patch
similarity index 98%
rename from patches/server/0117-Entities-can-use-portals-configuration.patch
rename to patches/server/0116-Entities-can-use-portals-configuration.patch
index 82022a1d7..8acdb6ae7 100644
--- a/patches/server/0117-Entities-can-use-portals-configuration.patch
+++ b/patches/server/0116-Entities-can-use-portals-configuration.patch
@@ -27,7 +27,7 @@ index 7e379aa144..13227c558b 100644
  
      public float a(Explosion explosion, IBlockAccess iblockaccess, BlockPosition blockposition, IBlockData iblockdata, Fluid fluid, float f) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 0bafbf52fb..a14f22dda4 100644
+index 2921619972..fb6fad7986 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -140,6 +140,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0118-LivingEntity-broadcastItemBreak.patch b/patches/server/0117-LivingEntity-broadcastItemBreak.patch
similarity index 100%
rename from patches/server/0118-LivingEntity-broadcastItemBreak.patch
rename to patches/server/0117-LivingEntity-broadcastItemBreak.patch
diff --git a/patches/server/0119-Customizable-WitherBoss-Health-and-Healing.patch b/patches/server/0118-Customizable-WitherBoss-Health-and-Healing.patch
similarity index 99%
rename from patches/server/0119-Customizable-WitherBoss-Health-and-Healing.patch
rename to patches/server/0118-Customizable-WitherBoss-Health-and-Healing.patch
index 57acaa925..33d7791f5 100644
--- a/patches/server/0119-Customizable-WitherBoss-Health-and-Healing.patch
+++ b/patches/server/0118-Customizable-WitherBoss-Health-and-Healing.patch
@@ -53,7 +53,7 @@ index f68cf834aa..4cac2bd091 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a14f22dda4..65baba9a9a 100644
+index fb6fad7986..fe35bdd100 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -902,10 +902,16 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0120-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0119-Allow-toggling-special-MobSpawners-per-world.patch
similarity index 99%
rename from patches/server/0120-Allow-toggling-special-MobSpawners-per-world.patch
rename to patches/server/0119-Allow-toggling-special-MobSpawners-per-world.patch
index fdd327478..b92e61bb7 100644
--- a/patches/server/0120-Allow-toggling-special-MobSpawners-per-world.patch
+++ b/patches/server/0119-Allow-toggling-special-MobSpawners-per-world.patch
@@ -72,7 +72,7 @@ index bc35bfd96a..644ff68795 100644
          this.worldDataServer = (WorldDataServer) iworlddataserver;
          worldDataServer.world = this;
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 65baba9a9a..789337e340 100644
+index fe35bdd100..f0b09ec3ae 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -7,6 +7,8 @@ import net.minecraft.server.IRegistry;
diff --git a/patches/server/0121-Raid-cooldown-setting.patch b/patches/server/0120-Raid-cooldown-setting.patch
similarity index 99%
rename from patches/server/0121-Raid-cooldown-setting.patch
rename to patches/server/0120-Raid-cooldown-setting.patch
index ab086b61b..f29366a85 100644
--- a/patches/server/0121-Raid-cooldown-setting.patch
+++ b/patches/server/0120-Raid-cooldown-setting.patch
@@ -52,7 +52,7 @@ index 826dcf9f7e..807910c60e 100644
                      if (!this.raids.containsKey(raid.getId())) {
                          this.raids.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 789337e340..4883856612 100644
+index f0b09ec3ae..27b9dcfec6 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -155,6 +155,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0122-Despawn-rate-config-options-per-projectile-type.patch b/patches/server/0121-Despawn-rate-config-options-per-projectile-type.patch
similarity index 99%
rename from patches/server/0122-Despawn-rate-config-options-per-projectile-type.patch
rename to patches/server/0121-Despawn-rate-config-options-per-projectile-type.patch
index a24c186bc..6021a5654 100644
--- a/patches/server/0122-Despawn-rate-config-options-per-projectile-type.patch
+++ b/patches/server/0121-Despawn-rate-config-options-per-projectile-type.patch
@@ -300,7 +300,7 @@ index b9f8ed3554..58f03f1d2e 100644
  
      public boolean checkIfLeftOwner() { return this.h(); } // Purpur - OBFHELPER
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4883856612..4733cb8e2f 100644
+index 27b9dcfec6..6b76469033 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -147,6 +147,35 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0123-PaperPR-Add-hex-color-code-support-for-console-loggi.patch b/patches/server/0122-PaperPR-Add-hex-color-code-support-for-console-loggi.patch
similarity index 100%
rename from patches/server/0123-PaperPR-Add-hex-color-code-support-for-console-loggi.patch
rename to patches/server/0122-PaperPR-Add-hex-color-code-support-for-console-loggi.patch
diff --git a/patches/server/0124-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0123-Add-option-to-disable-zombie-aggressiveness-towards-.patch
similarity index 99%
rename from patches/server/0124-Add-option-to-disable-zombie-aggressiveness-towards-.patch
rename to patches/server/0123-Add-option-to-disable-zombie-aggressiveness-towards-.patch
index 837669267..e36cc2794 100644
--- a/patches/server/0124-Add-option-to-disable-zombie-aggressiveness-towards-.patch
+++ b/patches/server/0123-Add-option-to-disable-zombie-aggressiveness-towards-.patch
@@ -69,7 +69,7 @@ index e2f68d843c..3ad8bd0847 100644
          this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bo));
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 4733cb8e2f..b7e43839ae 100644
+index 6b76469033..b83e32cd16 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -999,12 +999,14 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0125-Persistent-TileEntity-Lore-and-DisplayName.patch b/patches/server/0124-Persistent-TileEntity-Lore-and-DisplayName.patch
similarity index 99%
rename from patches/server/0125-Persistent-TileEntity-Lore-and-DisplayName.patch
rename to patches/server/0124-Persistent-TileEntity-Lore-and-DisplayName.patch
index d31b110b5..f04b30ea8 100644
--- a/patches/server/0125-Persistent-TileEntity-Lore-and-DisplayName.patch
+++ b/patches/server/0124-Persistent-TileEntity-Lore-and-DisplayName.patch
@@ -165,7 +165,7 @@ index 58d958a88a..8e87490954 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b7e43839ae..7f3d25b5a2 100644
+index b83e32cd16..e49746df3b 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -182,6 +182,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0126-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/server/0125-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
similarity index 100%
rename from patches/server/0126-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
rename to patches/server/0125-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch
diff --git a/patches/server/0127-Flying-squids-Oh-my.patch b/patches/server/0126-Flying-squids-Oh-my.patch
similarity index 98%
rename from patches/server/0127-Flying-squids-Oh-my.patch
rename to patches/server/0126-Flying-squids-Oh-my.patch
index cc9ef0d43..a56a629e2 100644
--- a/patches/server/0127-Flying-squids-Oh-my.patch
+++ b/patches/server/0126-Flying-squids-Oh-my.patch
@@ -38,7 +38,7 @@ index 70b952f10a..cee2265016 100644
                  float f1 = MathHelper.cos(f) * 0.2F;
                  float f2 = -0.1F + this.b.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 7f3d25b5a2..c40c65ce7a 100644
+index e49746df3b..ba46d21ed7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -860,10 +860,12 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0128-Infinity-bow-settings.patch b/patches/server/0127-Infinity-bow-settings.patch
similarity index 98%
rename from patches/server/0128-Infinity-bow-settings.patch
rename to patches/server/0127-Infinity-bow-settings.patch
index 17bd26cd1..6c93730c9 100644
--- a/patches/server/0128-Infinity-bow-settings.patch
+++ b/patches/server/0127-Infinity-bow-settings.patch
@@ -26,7 +26,7 @@ index dd6a93dc78..8241f3dafa 100644
                      entityhuman.b(StatisticList.ITEM_USED.b(this));
                  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c40c65ce7a..f0ecfd4e32 100644
+index ba46d21ed7..c0ec288c05 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -147,6 +147,15 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0129-Stonecutter-damage.patch b/patches/server/0128-Stonecutter-damage.patch
similarity index 98%
rename from patches/server/0129-Stonecutter-damage.patch
rename to patches/server/0128-Stonecutter-damage.patch
index 40eda9560..8d5aac134 100644
--- a/patches/server/0129-Stonecutter-damage.patch
+++ b/patches/server/0128-Stonecutter-damage.patch
@@ -39,7 +39,7 @@ index 33804e6893..fabadcd7a2 100644
                          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index f0ecfd4e32..a6f5276dd3 100644
+index c0ec288c05..1254bb5c8f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -372,6 +372,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0130-Configurable-daylight-cycle.patch b/patches/server/0129-Configurable-daylight-cycle.patch
similarity index 99%
rename from patches/server/0130-Configurable-daylight-cycle.patch
rename to patches/server/0129-Configurable-daylight-cycle.patch
index 4e52ccf07..94cdca8b6 100644
--- a/patches/server/0130-Configurable-daylight-cycle.patch
+++ b/patches/server/0129-Configurable-daylight-cycle.patch
@@ -74,7 +74,7 @@ index 644ff68795..dd8e284b26 100644
  
      public void doMobSpawning(boolean flag, boolean flag1) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index a6f5276dd3..e64cbed34e 100644
+index 1254bb5c8f..79e554a05e 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -116,6 +116,13 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0131-Allow-infinite-and-mending-enchantments-together.patch b/patches/server/0130-Allow-infinite-and-mending-enchantments-together.patch
similarity index 100%
rename from patches/server/0131-Allow-infinite-and-mending-enchantments-together.patch
rename to patches/server/0130-Allow-infinite-and-mending-enchantments-together.patch
diff --git a/patches/server/0132-Infinite-fuel-furnace.patch b/patches/server/0131-Infinite-fuel-furnace.patch
similarity index 98%
rename from patches/server/0132-Infinite-fuel-furnace.patch
rename to patches/server/0131-Infinite-fuel-furnace.patch
index 609c290d7..e7e084843 100644
--- a/patches/server/0132-Infinite-fuel-furnace.patch
+++ b/patches/server/0131-Infinite-fuel-furnace.patch
@@ -41,7 +41,7 @@ index 1d3c2dd936..1a47f0ae48 100644
  
          if (flag1) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e64cbed34e..9a595c2f91 100644
+index 79e554a05e..6adcce6174 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -340,6 +340,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0133-Arrows-should-not-reset-despawn-counter.patch b/patches/server/0132-Arrows-should-not-reset-despawn-counter.patch
similarity index 100%
rename from patches/server/0133-Arrows-should-not-reset-despawn-counter.patch
rename to patches/server/0132-Arrows-should-not-reset-despawn-counter.patch
diff --git a/patches/server/0134-Add-tablist-suffix-option-for-afk.patch b/patches/server/0133-Add-tablist-suffix-option-for-afk.patch
similarity index 98%
rename from patches/server/0134-Add-tablist-suffix-option-for-afk.patch
rename to patches/server/0133-Add-tablist-suffix-option-for-afk.patch
index 739003737..e2cb052c7 100644
--- a/patches/server/0134-Add-tablist-suffix-option-for-afk.patch
+++ b/patches/server/0133-Add-tablist-suffix-option-for-afk.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add tablist suffix option for afk
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 2992c51a28..9c86035c1c 100644
+index b5f6a98fe4..5dd2c4036e 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1959,7 +1959,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/patches/server/0135-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/server/0134-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
similarity index 98%
rename from patches/server/0135-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
rename to patches/server/0134-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
index 2d6575d7b..8ffccef6f 100644
--- a/patches/server/0135-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
+++ b/patches/server/0134-Ability-to-re-add-farmland-mechanics-from-Alpha.patch
@@ -24,7 +24,7 @@ index 8dd48669c2..099e0d3df2 100644
                  return;
              }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 9a595c2f91..acfa9772f8 100644
+index 6adcce6174..b01c7018ba 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -336,8 +336,10 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0136-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0135-Add-adjustable-breeding-cooldown-to-config.patch
similarity index 99%
rename from patches/server/0136-Add-adjustable-breeding-cooldown-to-config.patch
rename to patches/server/0135-Add-adjustable-breeding-cooldown-to-config.patch
index 307d05797..63d404e27 100644
--- a/patches/server/0136-Add-adjustable-breeding-cooldown-to-config.patch
+++ b/patches/server/0135-Add-adjustable-breeding-cooldown-to-config.patch
@@ -94,7 +94,7 @@ index ab97d076c9..b4ba9b56a9 100644
          this.generator = gen;
          this.world = new CraftWorld((WorldServer) this, gen, env);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index acfa9772f8..e85cf8116e 100644
+index b01c7018ba..6bf867483c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -202,6 +202,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0137-Make-animal-breeding-times-configurable.patch b/patches/server/0136-Make-animal-breeding-times-configurable.patch
similarity index 99%
rename from patches/server/0137-Make-animal-breeding-times-configurable.patch
rename to patches/server/0136-Make-animal-breeding-times-configurable.patch
index 3a8192507..75983dcde 100644
--- a/patches/server/0137-Make-animal-breeding-times-configurable.patch
+++ b/patches/server/0136-Make-animal-breeding-times-configurable.patch
@@ -398,7 +398,7 @@ index 9ae7168595..6c25f667ee 100644
  
      @Override
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e85cf8116e..cbd2e8a8b7 100644
+index 6bf867483c..58a880f7cb 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -423,10 +423,12 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0138-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server/0137-Apply-display-names-from-item-forms-of-entities-to-e.patch
similarity index 98%
rename from patches/server/0138-Apply-display-names-from-item-forms-of-entities-to-e.patch
rename to patches/server/0137-Apply-display-names-from-item-forms-of-entities-to-e.patch
index e9f44c87f..5f149decc 100644
--- a/patches/server/0138-Apply-display-names-from-item-forms-of-entities-to-e.patch
+++ b/patches/server/0137-Apply-display-names-from-item-forms-of-entities-to-e.patch
@@ -52,10 +52,10 @@ index d53bbe3169..bc558c54c9 100644
          switch (this.getType()) {
              case OAK:
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 6952832458..9214b2a3c9 100644
+index 80589799ab..2fef696732 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -1366,7 +1366,13 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1368,7 +1368,13 @@ public abstract class EntityInsentient extends EntityLiving {
              this.by = null;
              if (!this.world.isClientSide && flag1) {
                  this.forceDrops = true; // CraftBukkit
@@ -70,7 +70,7 @@ index 6952832458..9214b2a3c9 100644
                  this.forceDrops = false; // CraftBukkit
              }
  
-@@ -1442,7 +1448,13 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1444,7 +1450,13 @@ public abstract class EntityInsentient extends EntityLiving {
              }
  
              if (this.ticksLived > 100) {
@@ -196,7 +196,7 @@ index 40f553e395..7161eba52e 100644
          NBTTagCompound nbttagcompound = this.a("display");
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index cbd2e8a8b7..9f4f41b22e 100644
+index 58a880f7cb..8525741575 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -83,8 +83,10 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0139-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch b/patches/server/0138-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
similarity index 98%
rename from patches/server/0139-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
rename to patches/server/0138-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
index 092f8edc7..a503a9fab 100644
--- a/patches/server/0139-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
+++ b/patches/server/0138-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch
@@ -21,7 +21,7 @@ index 01163ce386..a7efce9731 100644
                      ((EntityInsentient) entityliving).setPersistent();
                  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 9f4f41b22e..c009d41bf9 100644
+index 8525741575..b7fe9865d5 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -84,9 +84,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0140-Add-twisting-and-weeping-vines-growth-rates.patch b/patches/server/0139-Add-twisting-and-weeping-vines-growth-rates.patch
similarity index 99%
rename from patches/server/0140-Add-twisting-and-weeping-vines-growth-rates.patch
rename to patches/server/0139-Add-twisting-and-weeping-vines-growth-rates.patch
index fab977921..bf10cdcf4 100644
--- a/patches/server/0140-Add-twisting-and-weeping-vines-growth-rates.patch
+++ b/patches/server/0139-Add-twisting-and-weeping-vines-growth-rates.patch
@@ -67,7 +67,7 @@ index 23dca19403..94ffadb91f 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index c009d41bf9..24179c3d5d 100644
+index b7fe9865d5..7d4e84bb85 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -408,6 +408,16 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0141-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch b/patches/server/0140-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
similarity index 99%
rename from patches/server/0141-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
rename to patches/server/0140-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
index 4b4718332..68809e7dc 100644
--- a/patches/server/0141-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
+++ b/patches/server/0140-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch
@@ -89,7 +89,7 @@ index 94ffadb91f..067df63ab2 100644
      // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 24179c3d5d..bd4c68bbfb 100644
+index 7d4e84bb85..3ed6fbed70 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -355,6 +355,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0142-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch b/patches/server/0141-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
similarity index 98%
rename from patches/server/0142-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
rename to patches/server/0141-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
index ed8e6946e..8289d7a55 100644
--- a/patches/server/0142-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
+++ b/patches/server/0141-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch
@@ -21,7 +21,7 @@ index 995849212c..acb2b3ed04 100644
  
      static class PathfinderGoalEndermanPickupBlock extends PathfinderGoal {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index bd4c68bbfb..830e030657 100644
+index 3ed6fbed70..8f0be34937 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -581,10 +581,12 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0143-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch b/patches/server/0142-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
similarity index 100%
rename from patches/server/0143-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
rename to patches/server/0142-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
diff --git a/patches/server/0144-Add-configurable-snowball-damage.patch b/patches/server/0143-Add-configurable-snowball-damage.patch
similarity index 98%
rename from patches/server/0144-Add-configurable-snowball-damage.patch
rename to patches/server/0143-Add-configurable-snowball-damage.patch
index b7401661b..4de090aa7 100644
--- a/patches/server/0144-Add-configurable-snowball-damage.patch
+++ b/patches/server/0143-Add-configurable-snowball-damage.patch
@@ -18,7 +18,7 @@ index 34a5f481e6..d7bab4446a 100644
          entity.damageEntity(DamageSource.projectile(this, this.getShooter()), (float) i);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 830e030657..2c26c4c476 100644
+index 8f0be34937..8d4fc335b8 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -196,6 +196,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0145-Zombie-break-door-minimum-difficulty-option.patch b/patches/server/0144-Zombie-break-door-minimum-difficulty-option.patch
similarity index 99%
rename from patches/server/0145-Zombie-break-door-minimum-difficulty-option.patch
rename to patches/server/0144-Zombie-break-door-minimum-difficulty-option.patch
index a64230220..1cde4efd4 100644
--- a/patches/server/0145-Zombie-break-door-minimum-difficulty-option.patch
+++ b/patches/server/0144-Zombie-break-door-minimum-difficulty-option.patch
@@ -40,7 +40,7 @@ index 7488a12926..23870a271b 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 2c26c4c476..58208a9022 100644
+index 8d4fc335b8..841f744395 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -2,6 +2,7 @@ package net.pl3x.purpur;
diff --git a/patches/server/0146-Add-demo-command.patch b/patches/server/0145-Add-demo-command.patch
similarity index 100%
rename from patches/server/0146-Add-demo-command.patch
rename to patches/server/0145-Add-demo-command.patch
diff --git a/patches/server/0147-Left-handed-API.patch b/patches/server/0146-Left-handed-API.patch
similarity index 100%
rename from patches/server/0147-Left-handed-API.patch
rename to patches/server/0146-Left-handed-API.patch
diff --git a/patches/server/0148-Origami-Fix-ProtocolLib-issues-on-Java-15.patch b/patches/server/0147-Origami-Fix-ProtocolLib-issues-on-Java-15.patch
similarity index 100%
rename from patches/server/0148-Origami-Fix-ProtocolLib-issues-on-Java-15.patch
rename to patches/server/0147-Origami-Fix-ProtocolLib-issues-on-Java-15.patch
diff --git a/patches/server/0149-Changeable-Mob-Left-Handed-Chance.patch b/patches/server/0148-Changeable-Mob-Left-Handed-Chance.patch
similarity index 93%
rename from patches/server/0149-Changeable-Mob-Left-Handed-Chance.patch
rename to patches/server/0148-Changeable-Mob-Left-Handed-Chance.patch
index 9604402c7..00d9b1fae 100644
--- a/patches/server/0149-Changeable-Mob-Left-Handed-Chance.patch
+++ b/patches/server/0148-Changeable-Mob-Left-Handed-Chance.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Changeable Mob Left Handed Chance
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 9214b2a3c9..3a79771d57 100644
+index 2fef696732..e2d7c20e66 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -1133,7 +1133,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -1135,7 +1135,7 @@ public abstract class EntityInsentient extends EntityLiving {
      @Nullable
      public GroupDataEntity prepare(WorldAccess worldaccess, DifficultyDamageScaler difficultydamagescaler, EnumMobSpawn enummobspawn, @Nullable GroupDataEntity groupdataentity, @Nullable NBTTagCompound nbttagcompound) {
          this.getAttributeInstance(GenericAttributes.FOLLOW_RANGE).addModifier(new AttributeModifier("Random spawn bonus", this.random.nextGaussian() * 0.05D, AttributeModifier.Operation.MULTIPLY_BASE));
@@ -18,7 +18,7 @@ index 9214b2a3c9..3a79771d57 100644
          } 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 58208a9022..f5e498aa39 100644
+index 841f744395..673c2e5f18 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -129,8 +129,10 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0150-Add-boat-fall-damage-config.patch b/patches/server/0149-Add-boat-fall-damage-config.patch
similarity index 97%
rename from patches/server/0150-Add-boat-fall-damage-config.patch
rename to patches/server/0149-Add-boat-fall-damage-config.patch
index cb9fdf4af..53e74f7a0 100644
--- a/patches/server/0150-Add-boat-fall-damage-config.patch
+++ b/patches/server/0149-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/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 9c86035c1c..16a20f2683 100644
+index 5dd2c4036e..50ea875a3b 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1017,7 +1017,16 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -27,7 +27,7 @@ index 9c86035c1c..16a20f2683 100644
  
              if (!flag && isSpawnInvulnerable() && damagesource != 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 f5e498aa39..d42fe79ece 100644
+index 673c2e5f18..d1f6c05924 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -206,6 +206,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0151-Config-migration-disable-saving-projectiles-to-disk-.patch b/patches/server/0150-Config-migration-disable-saving-projectiles-to-disk-.patch
similarity index 98%
rename from patches/server/0151-Config-migration-disable-saving-projectiles-to-disk-.patch
rename to patches/server/0150-Config-migration-disable-saving-projectiles-to-disk-.patch
index cd13ce2b3..b16c3981c 100644
--- a/patches/server/0151-Config-migration-disable-saving-projectiles-to-disk-.patch
+++ b/patches/server/0150-Config-migration-disable-saving-projectiles-to-disk-.patch
@@ -36,7 +36,7 @@ index 06e40ffed1..3c4c099beb 100644
      public static String afkBroadcastBack = "§e§o%s is no longer AFK";
      public static String afkTabListPrefix = "[AFK] ";
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index d42fe79ece..b5cda85f86 100644
+index d1f6c05924..1f8d05672a 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1,5 +1,6 @@
diff --git a/patches/server/0152-Snow-Golem-rate-of-fire-config.patch b/patches/server/0151-Snow-Golem-rate-of-fire-config.patch
similarity index 98%
rename from patches/server/0152-Snow-Golem-rate-of-fire-config.patch
rename to patches/server/0151-Snow-Golem-rate-of-fire-config.patch
index 4828f06e8..fd7e370d9 100644
--- a/patches/server/0152-Snow-Golem-rate-of-fire-config.patch
+++ b/patches/server/0151-Snow-Golem-rate-of-fire-config.patch
@@ -23,7 +23,7 @@ index e980da14cf..e5b3d298f5 100644
          this.goalSelector.a(3, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 6.0F));
          this.goalSelector.a(4, new PathfinderGoalRandomLookaround(this));
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index b5cda85f86..1c6ca8f272 100644
+index 1f8d05672a..301f32f8b0 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -962,12 +962,20 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0153-PaperPR-Apply-advancements-async.patch b/patches/server/0152-PaperPR-Apply-advancements-async.patch
similarity index 99%
rename from patches/server/0153-PaperPR-Apply-advancements-async.patch
rename to patches/server/0152-PaperPR-Apply-advancements-async.patch
index 10faee13b..726fc9102 100644
--- a/patches/server/0153-PaperPR-Apply-advancements-async.patch
+++ b/patches/server/0152-PaperPR-Apply-advancements-async.patch
@@ -17,7 +17,7 @@ index eaa1063ff2..a3b89a4f2a 100644
          this.player = entityplayer;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 16a20f2683..a18dadee56 100644
+index 50ea875a3b..cc6a54e06a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -49,7 +49,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
diff --git a/patches/server/0154-PaperPR-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0153-PaperPR-Config-option-for-Piglins-guarding-chests.patch
similarity index 97%
rename from patches/server/0154-PaperPR-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0153-PaperPR-Config-option-for-Piglins-guarding-chests.patch
index 7f01508d9..6a0de1a92 100644
--- a/patches/server/0154-PaperPR-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0153-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 5ffc5af1de..d713f7409f 100644
+index 2452f54d96..3ff2fa66b9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -669,6 +669,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0155-EMC-Configurable-disable-give-dropping.patch b/patches/server/0154-EMC-Configurable-disable-give-dropping.patch
similarity index 100%
rename from patches/server/0155-EMC-Configurable-disable-give-dropping.patch
rename to patches/server/0154-EMC-Configurable-disable-give-dropping.patch
diff --git a/patches/server/0156-Config-migration-climbing-should-not-bypass-cramming.patch b/patches/server/0155-Config-migration-climbing-should-not-bypass-cramming.patch
similarity index 98%
rename from patches/server/0156-Config-migration-climbing-should-not-bypass-cramming.patch
rename to patches/server/0155-Config-migration-climbing-should-not-bypass-cramming.patch
index d8156f92b..5786ca218 100644
--- a/patches/server/0156-Config-migration-climbing-should-not-bypass-cramming.patch
+++ b/patches/server/0155-Config-migration-climbing-should-not-bypass-cramming.patch
@@ -28,7 +28,7 @@ index de0776f8cd..674d06bfb3 100644
      public static String afkBroadcastBack = "§e§o%s is no longer AFK";
      public static String afkTabListPrefix = "[AFK] ";
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 1c6ca8f272..de16aee87d 100644
+index 301f32f8b0..6b80bc373f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -96,6 +96,17 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0157-Fix-drops-when-curing-zombie-villager.patch b/patches/server/0156-Fix-drops-when-curing-zombie-villager.patch
similarity index 84%
rename from patches/server/0157-Fix-drops-when-curing-zombie-villager.patch
rename to patches/server/0156-Fix-drops-when-curing-zombie-villager.patch
index 37d94b8a0..fed7b0dd8 100644
--- a/patches/server/0157-Fix-drops-when-curing-zombie-villager.patch
+++ b/patches/server/0156-Fix-drops-when-curing-zombie-villager.patch
@@ -19,21 +19,20 @@ index 7db942c659..d5d07b8042 100644
                  }
              }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index de16aee87d..5375c6c9ca 100644
+index 6b80bc373f..514788c208 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-@@ -1185,6 +1185,7 @@ public class PurpurWorldConfig {
+@@ -1184,11 +1184,13 @@ public class PurpurWorldConfig {
+     public boolean zombieVillagerJockeyOnlyBaby = true;
      public double zombieVillagerJockeyChance = 0.05D;
      public boolean zombieVillagerJockeyTryExistingChickens = true;
-     public boolean zombieVillagerResetReputationsWhenCured = false;
 +    public boolean zombieVillagerFixCureDrops = false;
      private void zombieVillagerSettings() {
          zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
          zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
-@@ -1192,5 +1193,6 @@ 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);
-         zombieVillagerResetReputationsWhenCured = getBoolean("mobs.zombie_villager.reset-reputation-when-cured", zombieVillagerResetReputationsWhenCured);
 +        zombieVillagerFixCureDrops = getBoolean("mobs.zombie_villager.fix-drops-on-cure", zombieVillagerFixCureDrops);
      }
  }
diff --git a/patches/server/0158-Lobotomize-stuck-villagers.patch b/patches/server/0157-Lobotomize-stuck-villagers.patch
similarity index 98%
rename from patches/server/0158-Lobotomize-stuck-villagers.patch
rename to patches/server/0157-Lobotomize-stuck-villagers.patch
index 7ac551b90..c725431a4 100644
--- a/patches/server/0158-Lobotomize-stuck-villagers.patch
+++ b/patches/server/0157-Lobotomize-stuck-villagers.patch
@@ -18,7 +18,7 @@ index 13227c558b..330ac6cf85 100644
      public float yaw;
      public float pitch;
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 823155821b..5d25c42d52 100644
+index 166a8f9a7f..96cfc0c5c3 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -187,15 +187,28 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -71,7 +71,7 @@ index b92ca4a6de..1208464fba 100644
          // Paper start - add target parameter
          return this.a(blockposition, null, i);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 5375c6c9ca..020a42a5e5 100644
+index 514788c208..659b540aa1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1056,6 +1056,7 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0159-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0158-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
similarity index 99%
rename from patches/server/0159-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
rename to patches/server/0158-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
index 611fd5af0..bd55c0d3f 100644
--- a/patches/server/0159-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
+++ b/patches/server/0158-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
@@ -133,7 +133,7 @@ index 2d91869660..e376306bc2 100644
          } else {
              object = new BehaviorWork();
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 5d25c42d52..6225101c63 100644
+index 96cfc0c5c3..f0a5708f01 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -131,7 +131,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -234,7 +234,7 @@ index 3c60da7ac6..6493f220a0 100644
      public static final VillagerProfession FISHERMAN = a("fisherman", VillagePlaceType.i, SoundEffects.ENTITY_VILLAGER_WORK_FISHERMAN);
      public static final VillagerProfession FLETCHER = a("fletcher", VillagePlaceType.j, SoundEffects.ENTITY_VILLAGER_WORK_FLETCHER);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 020a42a5e5..e1d1c28469 100644
+index 659b540aa1..7ade1c54ad 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1057,6 +1057,8 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0160-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0159-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
similarity index 98%
rename from patches/server/0160-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
rename to patches/server/0159-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
index ee6743773..f4fdd9baa 100644
--- a/patches/server/0160-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
+++ b/patches/server/0159-Toggle-for-Zombified-Piglin-death-always-counting-as.patch
@@ -35,7 +35,7 @@ index 3327dbbf87..57f3358b8d 100644
          }
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index e1d1c28469..fa98eef4f8 100644
+index 7ade1c54ad..cc92689b4c 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1177,12 +1177,14 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0161-Spread-out-and-optimise-player-list-ticks.patch b/patches/server/0160-Spread-out-and-optimise-player-list-ticks.patch
similarity index 100%
rename from patches/server/0161-Spread-out-and-optimise-player-list-ticks.patch
rename to patches/server/0160-Spread-out-and-optimise-player-list-ticks.patch
diff --git a/patches/server/0162-Wolf-naturally-spawn-rabid.patch b/patches/server/0161-Wolf-naturally-spawn-rabid.patch
similarity index 99%
rename from patches/server/0162-Wolf-naturally-spawn-rabid.patch
rename to patches/server/0161-Wolf-naturally-spawn-rabid.patch
index 812fdc749..7c21146f7 100644
--- a/patches/server/0162-Wolf-naturally-spawn-rabid.patch
+++ b/patches/server/0161-Wolf-naturally-spawn-rabid.patch
@@ -93,7 +93,7 @@ index 6c25f667ee..7149b10e4a 100644
          this.a((WorldServer) this.world, nbttagcompound);
      }
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index fa98eef4f8..88db847d7b 100644
+index cc92689b4c..0a471a4542 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -1128,10 +1128,12 @@ public class PurpurWorldConfig {