diff --git a/crates/horizon-client/src/block_entity_anim.rs b/crates/horizon-client/src/block_entity_anim.rs index fd91051fa..6cac30781 100644 --- a/crates/horizon-client/src/block_entity_anim.rs +++ b/crates/horizon-client/src/block_entity_anim.rs @@ -435,7 +435,8 @@ pub struct BellTick { pub ended: Option<(Vec<([f64; 3], i32)>, Vec)>, } -fn closer_to_center_than(pos: [i32; 3], p: [f64; 3], distance: f64) -> bool { +/// `Vec3i.closerToCenterThan`: `p` is within `distance` of the block's centre. +pub fn closer_to_center_than(pos: [i32; 3], p: [f64; 3], distance: f64) -> bool { let dx = f64::from(pos[0]) + 0.5 - p[0]; let dy = f64::from(pos[1]) + 0.5 - p[1]; let dz = f64::from(pos[2]) + 0.5 - p[2]; diff --git a/crates/horizon-client/src/game/block_entity_anims.rs b/crates/horizon-client/src/game/block_entity_anims.rs index 2705d8388..da788bc5b 100644 --- a/crates/horizon-client/src/game/block_entity_anims.rs +++ b/crates/horizon-client/src/game/block_entity_anims.rs @@ -7,6 +7,7 @@ use super::Game; use horizon_client::{ block_entity_anim::{ BellEntity, ConduitServer, ConduitTarget, EndGateway, Shulker, ShulkerStatus, Ticker, + closer_to_center_than, }, block_entity_render::BlockAnim, collisions::{SceneCollisions, no_collision_empty}, @@ -49,11 +50,16 @@ impl Game<'_> { } Some(Ticker::Bell) => { let gathered = self.bell_gather(pos); - self.be_anims + let rung = self + .be_anims .bells .entry(pos) .or_default() .trigger_event(a, b, time, || gathered); + // The server's copy tells the living entities within 32 blocks. + if rung && self.remote.is_none() { + self.bell_heard(pos, time); + } } Some(Ticker::Gateway) => { let initial = self.gateway_loaded(pos); @@ -200,6 +206,26 @@ impl Game<'_> { } out } + /// `BellBlockEntity.updateEntities`: every gathered entity alive within 32 + /// blocks of the bell's centre gets `HEARD_BELL_TIME` (only villagers + /// have a brain that reads it). + fn bell_heard(&mut self, pos: [i32; 3], now: i64) { + let nearby = self + .be_anims + .bells + .get(&pos) + .and_then(|b| b.nearby.clone()) + .unwrap_or_default(); + for m in &mut self.mobs { + if m.alive() + && !m.removed + && nearby.contains(&u64::from(m.id)) + && closer_to_center_than(pos, [m.position.x, m.position.y, m.position.z], 32.0) + { + horizon_client::mobs::villager_brain::heard_bell(m, now); + } + } + } /// `ShulkerBoxBlock.canOpen`: a closed box opens only when its lid has /// room to rise (`level.noCollision` of the half-open lid box). pub(super) fn shulker_can_open(&self, pos: [i32; 3]) -> bool { diff --git a/crates/horizon-client/src/mobs/villager_brain.rs b/crates/horizon-client/src/mobs/villager_brain.rs index 676d9b713..e6ca62b14 100644 --- a/crates/horizon-client/src/mobs/villager_brain.rs +++ b/crates/horizon-client/src/mobs/villager_brain.rs @@ -4222,6 +4222,13 @@ pub fn woken(m: &mut Mob, now: i64) { mem(m).last_woken.set(now); } } +/// `BellBlockEntity.updateEntities`: a bell rung within 32 blocks sets +/// `HEARD_BELL_TIME` to the game time. +pub fn heard_bell(m: &mut Mob, now: i64) { + if brain(m).is_some() { + mem(m).heard_bell_time.set(now); + } +} /// What other villagers see of this one's brain. pub fn potential_job_site(m: &Mob) -> Option<[i32; 3]> { mem_ref(m).and_then(|mm| mm.potential_job_site.value())