diff --git a/crates/horizon-client/src/game/nether_portal.rs b/crates/horizon-client/src/game/nether_portal.rs index df684e713..9ff9e8421 100644 --- a/crates/horizon-client/src/game/nether_portal.rs +++ b/crates/horizon-client/src/game/nether_portal.rs @@ -486,9 +486,10 @@ impl Game<'_> { .filter(|m| self.mob_can_use_portal(m)) .map(|m| (m.id, m.position, m.width(), m.height())) .collect(); + let mut portal_sections = horizon_client::fast_hash::FxHashMap::default(); for (id, to, width, height) in items.into_iter().chain(mobs) { let from = self.portals.before.get(&id).copied().unwrap_or(to); - if let Some(pos) = self.swept_portal(from, to, width, height) { + if let Some(pos) = self.swept_portal(from, to, width, height, &mut portal_sections) { inside.push((id, pos)); } } @@ -502,7 +503,14 @@ impl Game<'_> { } /// The first nether portal block an entity box swept through /// (`Entity.checkInsideBlocks`, whose first portal sets the entry). - fn swept_portal(&self, from: Vec3, to: Vec3, width: f32, height: f32) -> Option { + fn swept_portal( + &self, + from: Vec3, + to: Vec3, + width: f32, + height: f32, + portal_sections: &mut horizon_client::fast_hash::FxHashMap<(i32, i32, i32), bool>, + ) -> Option { let half = f64::from(width) / 2.0; let bounds = horizon_core::geometry::Aabb::new( Vec3::new(to.x - half, to.y, to.z - half), @@ -513,6 +521,13 @@ impl Game<'_> { f64::from(1.0e-5_f32), f64::from(1.0e-5_f32), )); + // Every block the sweep visits lies in the box covering both ends. + let reach = bounds + .union_bounds(bounds.move_by(from.subtract(to))) + .inflate(Vec3::new(1.0, 1.0, 1.0)); + if !self.may_hold_portal(reach, portal_sections) { + return None; + } let mut found = None; let _ = horizon_core::geometry::sweep_intersected_blocks( from, @@ -534,6 +549,54 @@ impl Game<'_> { ); found } + /// Whether a section `reach` touches has a nether portal state in its + /// palette: without one, no block there is a portal. Answers are kept + /// per section for the tick; a box over many sections is not checked. + fn may_hold_portal( + &self, + reach: horizon_core::geometry::Aabb, + seen: &mut horizon_client::fast_hash::FxHashMap<(i32, i32, i32), bool>, + ) -> bool { + use horizon_client::chunk::{MIN_Y, SECTIONS}; + let (min, max) = (reach.min_position(), reach.max_position()); + if !min.is_finite() || !max.is_finite() { + return true; + } + let (min, max) = (BlockPos::containing(min), BlockPos::containing(max)); + let top = SECTIONS as i32 - 1; + let (x0, x1) = (min.x >> 4, max.x >> 4); + let (z0, z1) = (min.z >> 4, max.z >> 4); + let (y0, y1) = ( + ((min.y - MIN_Y) >> 4).clamp(0, top), + ((max.y - MIN_Y) >> 4).clamp(0, top), + ); + let count = (i64::from(x1) - i64::from(x0) + 1) + * (i64::from(y1) - i64::from(y0) + 1) + * (i64::from(z1) - i64::from(z0) + 1); + if count > 64 { + return true; + } + let behaviours = &self.res.behaviours; + let chunks = &self.world.chunks; + (x0..=x1).any(|cx| { + (z0..=z1).any(|cz| { + (y0..=y1).any(|sy| { + *seen.entry((cx, sy, cz)).or_insert_with(|| { + chunks + .get(&(cx, cz)) + .and_then(|c| c.sections.get(sy as usize)) + .is_some_and(|s| { + s.blocks.maybe_has(|v| { + behaviours + .portal_axis(horizon_world::registry::BlockStateId(v)) + .is_some() + }) + }) + }) + }) + }) + }) + } /// `Entity.teleportCrossDimension` away from the loaded dimension: the /// entity is saved and removed, and waits for its dimension to load. fn send_through_portal(&mut self, id: u32, entry: BlockPos) {