Merge pull request #2336 from kacpherek/fix/zombie-drowned-conversion-stops

🤖 Agent: Proven in union R1 (branch union/cg19-r1, main + 83 of kacpherek's PRs): the 98 harnesses it can affect, clippy -D warnings, tests, lan_e2e in-frame and on the server thread.
This commit is contained in:
Ludovic Marie
2026-10-27 14:36:31 +01:00
committed by GitHub
+6 -1
View File
@@ -563,7 +563,12 @@ pub fn custom_server_ai_step(m: &mut Mob, cx: &mut Cx) {
return zombified_piglin_step(m, cx);
}
if matches!(m.species(), Species::Zombie | Species::Husk) && m.alive() {
if m.extra.counter2 > 0 {
if m.extra.counter2 > 0 && !m.fluids.eye_in_water {
// ConversionTracker.tick: leaving the water ends a started
// conversion too.
m.extra.counter = -1;
m.extra.counter2 = 0;
} else if m.extra.counter2 > 0 {
m.extra.counter2 -= 1;
if m.extra.counter2 == 0 {
let (kind, sound) = if m.species() == Species::Husk {