diff --git a/crates/horizon-client/src/game/raids.rs b/crates/horizon-client/src/game/raids.rs index da7c79394..c51fbdc0b 100644 --- a/crates/horizon-client/src/game/raids.rs +++ b/crates/horizon-client/src/game/raids.rs @@ -1036,6 +1036,7 @@ impl Game<'_> { /// read it). fn sync_villager_raids(&mut self, infos: &HashMap>) { let raids = &self.raiding.raids; + let mut ongoing = Vec::new(); for m in &mut self.mobs { if m.species() != Species::Villager { continue; @@ -1061,7 +1062,27 @@ impl Game<'_> { let ext = mobs_villager::ext_mut(m); ext.raid = status; ext.raid_wave = wave; + if !m.no_ai && matches!(status, mobs_villager::PRE_RAID | mobs_villager::RAID) { + ongoing.push(m.id); + } } + // Villager.customServerAiStep: a 1 in 100 chance each tick, in an + // ongoing raid, of entity event 42 (`handleEntityEvent` splashes). + for id in ongoing { + if self.particles.random().next_int_bound(100) == Ok(0) { + self.mob_raid_splash(id); + } + } + } + /// Entity event 42 for villager `id`: the guests get the byte, and this + /// game draws `AbstractVillager.addParticlesAroundSelf(SPLASH)` itself. + fn mob_raid_splash(&mut self, id: u32) { + let Some(m) = self.mobs.iter().find(|m| m.id == id) else { + return; + }; + let at = [m.position.x, m.position.y, m.position.z]; + self.lan_entity_event(id as i32, 42, at); + self.particles_around_mob(id, "splash", horizon_client::particles::Burst::VILLAGER); } /// The raid bar a living player at `at` is in (`Raid.getPlayers`): red,