From e9d2c1041774e9e291c2b8e360bf5c7e2485ffb7 Mon Sep 17 00:00:00 2001 From: vlesmentie <129341611+vlesmentie@users.noreply.github.com> Date: Sun, 25 Oct 2026 10:32:36 -0300 Subject: [PATCH] Peaceful zombie horses spawn without their zombie rider ZombieHorse.finalizeSpawn gets its rider from EntityType.create, which returns null for a notInPeaceful type (the zombie) in peaceful, so vanilla spawns the zombie horse alone there. spawn_jockeys created the rider regardless. mobs/finalize.rs already skips it through level.create. Fixes #1761. Co-Authored-By: Claude Opus 5.5 --- crates/horizon-client/src/game/passengers.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/crates/horizon-client/src/game/passengers.rs b/crates/horizon-client/src/game/passengers.rs index b20c1560b..8f205c484 100644 --- a/crates/horizon-client/src/game/passengers.rs +++ b/crates/horizon-client/src/game/passengers.rs @@ -147,8 +147,16 @@ impl Game<'_> { } } Species::Strider if !baby => self.spawn_strider_jockey(id, at), - // ZombieHorse.finalizeSpawn: a zombie with an iron spear. - Species::ZombieHorse if natural => { + // ZombieHorse.finalizeSpawn: a zombie with an iron spear. The rider + // comes from EntityType.create, which makes no zombie in peaceful + // (canSpawn), so a peaceful zombie horse spawns without one. + Species::ZombieHorse + if natural + && (self.ui.difficulty != 0 + || horizon_client::mobs::spawn_rules::allowed_in_peaceful( + Species::Zombie, + )) => + { if let Some(zombie) = self.spawn_mob("minecraft:zombie", at, false) { if let Some(z) = self.mobs.iter_mut().find(|m| m.id == zombie) { z.extra.main_hand = Some("minecraft:iron_spear".into());