Skip to content

Minecraft: Java Edition 26.3 rewritten from scratch in Rust, checked against vanilla with 281 differential harnesses. Get it with the Horizon launcher.

Merge pull request #6453 from MSedgeMC/fix/boat-fluid-current

Ludovic Marie5dfae6950b82
diff --cc crates/horizon-client/src/game/boats.rs
index 00675ddb0,bec0e923f..3fd178587
--- a/crates/horizon-client/src/game/boats.rs
+++ b/crates/horizon-client/src/game/boats.rs
@@@ -580,9 -577,18 +580,19 @@@ impl Game<'_>
b.paddling = [false; 2];
b.input = [false; 4];
}
+ // `Entity.baseTick`: the boat is immersed and pushed by the current it
+ // sits in (`isPushedByFluid`), before `floatBoat` scales the velocity.
+ let _ = horizon_client::entities::update_entity_fluids(
+ b.bounds(),
+ b.position,
+ b.position.y + HEIGHT,
+ &mut b.velocity,
+ &self.world,
+ &self.res.motion().fluids,
+ );
// floatBoat
- let mut vspeed = -0.04;
+ // `-getGravity()`: none with NoGravity.
+ let mut vspeed = if b.no_gravity { 0.0 } else { -0.04 };
let mut buoyancy = 0.0;
let inv_friction: f32;
let obstacles = self.boat_move_obstacles(&b);