mobs: jumpOutOfFluid wants a dry, entity-free box
Entity.isFree is noCollision(this, box) && !containsAnyLiquid(box); the check only looked at block collisions, so a mob pressed against a wall by water flow hopped out where vanilla refuses, and it ignored other collidable entities entirely. Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
@@ -235,6 +235,26 @@ impl MobWorld<'_> {
|
||||
};
|
||||
scene.unobstructed(b).unwrap_or(false)
|
||||
}
|
||||
/// `LevelReader.containsAnyLiquid`: the blocks from the box's minimum
|
||||
/// corner to the block holding its maximum corner.
|
||||
pub fn contains_any_liquid(&self, b: Aabb) -> bool {
|
||||
let (lo, hi) = (b.min_position(), b.max_position());
|
||||
let (x0, y0, z0) = (
|
||||
lo.x.floor() as i32,
|
||||
lo.y.floor() as i32,
|
||||
lo.z.floor() as i32,
|
||||
);
|
||||
let (x1, y1, z1) = (
|
||||
hi.x.floor() as i32,
|
||||
hi.y.floor() as i32,
|
||||
hi.z.floor() as i32,
|
||||
);
|
||||
(x0..=x1).any(|x| {
|
||||
(y0..=y1).any(|y| {
|
||||
(z0..=z1).any(|z| self.facts.get(self.world.block(x, y, z)).fluid != Fluid::None)
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
impl Mob {
|
||||
/// `Entity.refreshDimensions` after growing from `old_w` by `old_h`:
|
||||
@@ -813,14 +833,21 @@ impl Mob {
|
||||
self.velocity.y -= gravity / 4.0;
|
||||
}
|
||||
}
|
||||
// jumpOutOfFluid
|
||||
// jumpOutOfFluid: Entity.isFree wants the box dry and clear of
|
||||
// collidable entities too.
|
||||
let m = self.velocity;
|
||||
let ahead = self.bounds().move_by(Vec3::new(
|
||||
m.x,
|
||||
m.y + f64::from(0.6_f32) - self.position.y + old_y,
|
||||
m.z,
|
||||
));
|
||||
let wide = ahead.inflate(Vec3::new(1.0e-7, 1.0e-7, 1.0e-7));
|
||||
if self.horizontal_collision
|
||||
&& w.no_collision(self.bounds().move_by(Vec3::new(
|
||||
m.x,
|
||||
m.y + f64::from(0.6_f32) - self.position.y + old_y,
|
||||
m.z,
|
||||
)))
|
||||
&& w.no_collision(ahead)
|
||||
&& !w.contains_any_liquid(ahead)
|
||||
&& !w
|
||||
.others_near(wide)
|
||||
.any(|s| s.id != self.id && s.alive && s.bounds.intersects(wide))
|
||||
{
|
||||
self.velocity.y = f64::from(0.3_f32);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user