2022-06-09 08:51:45 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Zero <zero@cock.li>
Date: Sat, 22 Feb 2020 16:10:31 -0500
Subject: [PATCH] Configurable chance of villager zombie infection
This allows you to solve an issue in vanilla behavior where:
* On easy difficulty your villagers will NEVER get infected, meaning they will always die.
* On normal difficulty they will have a 50% of getting infected or dying.
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
2023-12-06 18:21:23 +00:00
index d4f72024c15d03f70a86f09714403ace6e26885a..79634693899f50e34ffe0898f75e5b31fd11ab53 100644
2022-06-09 08:51:45 +00:00
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
2023-10-04 01:06:23 +00:00
@@ -452,12 +452,8 @@ public class Zombie extends Monster {
2023-06-07 22:12:41 +00:00
public boolean killedEntity(ServerLevel world, LivingEntity other) {
boolean flag = super.killedEntity(world, other);
2022-06-09 08:51:45 +00:00
- if ((world.getDifficulty() == Difficulty.NORMAL || world.getDifficulty() == Difficulty.HARD) && other instanceof Villager) {
2022-12-07 19:22:28 +00:00
- Villager entityvillager = (Villager) other;
-
2022-06-09 08:51:45 +00:00
- if (world.getDifficulty() != Difficulty.HARD && this.random.nextBoolean()) {
2023-10-04 01:06:23 +00:00
- return flag;
- }
2023-11-01 21:59:00 +00:00
+ final double fallbackChance = world.getDifficulty() == Difficulty.HARD ? 100d : world.getDifficulty() == Difficulty.NORMAL ? 50d : 0d; // Paper
+ if (this.random.nextDouble() * 100 < world.paperConfig().entities.behavior.zombieVillagerInfectionChance.or(fallbackChance) && other instanceof Villager entityvillager) { // Paper
2022-06-09 08:51:45 +00:00
// CraftBukkit start
2022-12-07 19:22:28 +00:00
flag = Zombie.zombifyVillager(world, entityvillager, this.blockPosition(), this.isSilent(), CreatureSpawnEvent.SpawnReason.INFECTION) == null;
}