From b72753cb001ff894323f65faf30a44c04c84913d Mon Sep 17 00:00:00 2001 From: rafael59r2 <12960698+rafael59r2@users.noreply.github.com> Date: Mon, 25 Oct 2021 20:01:30 +0100 Subject: [PATCH] Add option to disable zombie villagers cure (#711) --- ...ion-to-disable-zombie-villagers-cure.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 patches/server/0257-Add-option-to-disable-zombie-villagers-cure.patch diff --git a/patches/server/0257-Add-option-to-disable-zombie-villagers-cure.patch b/patches/server/0257-Add-option-to-disable-zombie-villagers-cure.patch new file mode 100644 index 000000000..a3909c3a4 --- /dev/null +++ b/patches/server/0257-Add-option-to-disable-zombie-villagers-cure.patch @@ -0,0 +1,39 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: rafael59r2 <12960698+rafael59r2@users.noreply.github.com> +Date: Tue, 19 Oct 2021 13:10:44 +0100 +Subject: [PATCH] Add option to disable zombie villagers cure + + +diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java +index a320483ef8b72edc40453c9e88bd90bd882dfe60..956bfa524eabfea15d448d0b477e82e0f4a8f283 100644 +--- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java ++++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java +@@ -202,7 +202,7 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder { + ItemStack itemstack = player.getItemInHand(hand); + + if (itemstack.is(Items.GOLDEN_APPLE)) { +- if (this.hasEffect(MobEffects.WEAKNESS)) { ++ if (this.hasEffect(MobEffects.WEAKNESS) && level.purpurConfig.zombieVillagerCureEnabled) { // Purpur + if (!player.getAbilities().instabuild) { + itemstack.shrink(1); + } +diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +index d31fba4f062e9fe4e3f52827936edbb3f81f234b..d60fefd418cb1f55dfe7c71e12355e0f836ab56b 100644 +--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java ++++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +@@ -2648,6 +2648,7 @@ public class PurpurWorldConfig { + public boolean zombieVillagerTakeDamageFromWater = false; + public int zombieVillagerCuringTimeMin = 3600; + public int zombieVillagerCuringTimeMax = 6000; ++ public boolean zombieVillagerCureEnabled = true; + private void zombieVillagerSettings() { + zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable); + zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater); +@@ -2664,6 +2665,7 @@ public class PurpurWorldConfig { + zombieVillagerTakeDamageFromWater = getBoolean("mobs.zombie_villager.takes-damage-from-water", zombieVillagerTakeDamageFromWater); + zombieVillagerCuringTimeMin = getInt("mobs.zombie_villager.curing_time.min", zombieVillagerCuringTimeMin); + zombieVillagerCuringTimeMax = getInt("mobs.zombie_villager.curing_time.max", zombieVillagerCuringTimeMax); ++ zombieVillagerCureEnabled = getBoolean("mobs.zombie_villager.cure.enabled", zombieVillagerCureEnabled); + } + + public boolean zombifiedPiglinRidable = false;