diff --git a/crates/horizon-client/src/game/boat_passengers.rs b/crates/horizon-client/src/game/boat_passengers.rs index f62381a1a..96686f69b 100644 --- a/crates/horizon-client/src/game/boat_passengers.rs +++ b/crates/horizon-client/src/game/boat_passengers.rs @@ -36,7 +36,7 @@ fn moved_by_push(m: &Mob) -> bool { } /// `Entity.push(Entity)`: the push `other` gets from `this` (which takes the /// opposite one), or None when they stand on nearly the same spot. -fn push_impulse(this: Vec3, other: Vec3) -> Option { +pub(super) fn push_impulse(this: Vec3, other: Vec3) -> Option { let (mut xa, mut za) = (other.x - this.x, other.z - this.z); let mut dd = xa.abs().max(za.abs()); if dd < f64::from(0.01_f32) { @@ -51,7 +51,7 @@ fn push_impulse(this: Vec3, other: Vec3) -> Option { } /// `AbstractBoat.push`: another boat is pushed while it is lower than this /// boat's top, anything else while its feet are no higher than the boat's. -fn boat_pushes(boat: Aabb, other: Aabb, other_is_boat: bool) -> bool { +pub(super) fn boat_pushes(boat: Aabb, other: Aabb, other_is_boat: bool) -> bool { if other_is_boat { other.min_position().y < boat.max_position().y } else { @@ -179,9 +179,9 @@ impl Game<'_> { /// The end of `AbstractBoat.tick` on the server for boat `i`: each /// entity it touches gets in (a mob, while no player steers) or is /// pushed apart from it, and `LivingEntity.pushEntities` of each mob and - /// player touching it pushes the two apart once more. The player's own - /// share of a push only reaches the server's copy of it, which its - /// client never feels, so players are not moved here. + /// player touching it pushes the two apart once more. Only the window's + /// own player is moved here: a server's players are pushed by their + /// clients, which tick the boats near them (`remote_pushes`). pub(super) fn boat_contacts(&mut self, i: usize) { let (id, bb, max) = { let b = &self.boats[i]; @@ -194,7 +194,9 @@ impl Game<'_> { )); let mut count = self.boat_passengers(id); // getControllingPassenger is a player: one rides it (players sit first). - let pick_up = self.boat_players(id) == 0 && !self.boats[i].under_water(); + let pick_up = self.boat_players(id) == 0; + // canAddPassenger, which startRiding asks after the checks below. + let room = !self.boats[i].under_water(); // (mob, touched by the boat's sweep, its own pushEntities reaches the boat) let teams = self.mob_teams(); let mobs: Vec<(usize, bool, bool)> = (0..self.mobs.len()) @@ -214,13 +216,14 @@ impl Game<'_> { }) .collect(); let player_team = teams.of(Who::Player); - let players: Vec<(Aabb, bool, bool)> = self + let players: Vec<(Aabb, bool, bool, bool)> = self .players_outside(id) .into_iter() .map(|(pb, own)| { let team = if own { player_team } else { None }; ( pb, + own, pb.intersects(area) && pushable_by(None, team, true), pb.intersects(bb) && pushable_by(team, None, true), ) @@ -239,13 +242,18 @@ impl Game<'_> { .mob_data() .entity_has("minecraft:cannot_be_pushed_onto_boats", &m.kind.id); if boards { - // Entity.canRide: not while its boarding cooldown runs. - if m.extra.boarding_cooldown <= 0 { + // startRiding fails quietly (no push) while the mob's + // boarding cooldown runs (Entity.canRide) or the boat + // is under water. + if room && m.extra.boarding_cooldown <= 0 { let m = &mut self.mobs[j]; m.extra.mount = Some(id); m.extra.passenger = true; m.ai.nav.stop(); + let mob = m.id; count += 1; + // Mob.startRiding drops its lead. + self.break_leash(mob, true, false); } continue; } @@ -255,15 +263,20 @@ impl Game<'_> { self.boat_push_mob(i, j, count); } } - for (pb, touched, pushes) in players { + for (pb, own, touched, pushes) in players { + let Some(v) = push_impulse(self.boats[i].position, pb.center()) + .filter(|_| boat_pushes(bb, pb, false)) + else { + continue; + }; for _ in 0..usize::from(touched) + usize::from(pushes) { - let b = &mut self.boats[i]; - if count == 0 - && boat_pushes(bb, pb, false) - && let Some(v) = push_impulse(b.position, pb.center()) - { + if count == 0 { + let b = &mut self.boats[i]; b.velocity = b.velocity.subtract(v); } + if own && let Some(p) = self.player.as_mut() { + p.velocity = p.velocity.add_vector(v); + } } } for k in 0..self.boats.len() { diff --git a/crates/horizon-client/src/game/boats.rs b/crates/horizon-client/src/game/boats.rs index 9f1341599..df7158d9a 100644 --- a/crates/horizon-client/src/game/boats.rs +++ b/crates/horizon-client/src/game/boats.rs @@ -96,7 +96,8 @@ impl Boat { Vec3::new(p.x + w, p.y + HEIGHT, p.z + w), ) } - /// Under water or flowing water (`isEyeInFluid(WATER)` for its seats). + /// `isUnderWater`; it stands in for `canAddPassenger`'s + /// `isEyeInFluid(WATER)` too. pub fn under_water(&self) -> bool { matches!(self.status, Status::UnderWater | Status::UnderFlowingWater) } diff --git a/crates/horizon-client/src/game/lan_actions.rs b/crates/horizon-client/src/game/lan_actions.rs index 1fcb05249..58ed97c2f 100644 --- a/crates/horizon-client/src/game/lan_actions.rs +++ b/crates/horizon-client/src/game/lan_actions.rs @@ -1325,7 +1325,6 @@ impl Game<'_> { } }; let g = &mut host.hub.guests[gi]; - let eye = [g.position[0], g.position[1] + g.eye_height(), g.position[2]]; let d = [centre[0] - eye[0], centre[1] - eye[1], centre[2] - eye[2]]; let horizontal = (d[0] * d[0] + d[2] * d[2]).sqrt(); g.yaw = (-d[0].atan2(d[2])).to_degrees() as f32; diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index 38f9497ec..b9e3e18fc 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -3249,9 +3249,10 @@ impl Game<'_> { player.flying_speed = a.flying_speed; } /// The local player's share of every touching entity's - /// `LivingEntity.pushEntities`: on a client `EntitySelector.pushableBy` - /// lets entities push only the local player, so the server never sends - /// these pushes. `doPush(player)` is `player.push(entity)`. + /// `LivingEntity.pushEntities`, and of the boats' pushes: on a client + /// `EntitySelector.pushableBy` lets entities push only the local player, + /// so the server never sends these pushes. `doPush(player)` is + /// `player.push(entity)`. fn remote_pushes(&self) -> Vec3 { let (Some(p), Some(r)) = (self.player.as_ref(), self.remote.as_ref()) else { return Vec3::ZERO; @@ -3310,6 +3311,26 @@ impl Game<'_> { za *= f64::from(0.05_f32); push = Vec3::new(push.x - xa, push.y, push.z - za); } + // AbstractBoat.push(player) from the boat's own tick (its box grown + // by 0.2 sideways) and from the player's pushEntities (its box). + let player_team = teams.of(Who::Player); + let area = Vec3::new(f64::from(0.2_f32), f64::from(-0.01_f32), f64::from(0.2_f32)); + for b in self.boats.iter().filter(|b| self.riding != Some(b.id)) { + let bb = b.bounds(); + let times = usize::from( + bounds.intersects(bb.inflate(area)) + && horizon_client::scoreboard::pushable_by(None, player_team, true), + ) + usize::from( + bounds.intersects(bb) + && horizon_client::scoreboard::pushable_by(player_team, None, true), + ); + if times > 0 + && super::boat_passengers::boat_pushes(bb, bounds, false) + && let Some(v) = super::boat_passengers::push_impulse(b.position, p.position) + { + push = push.add_vector(v.scale(times as f64)); + } + } push } /// ClientLevel.tickEntities; a frozen level only ticks the players