This commit is contained in:
Antonios Barotsis 2023-04-04 23:25:11 +02:00
parent d292026935
commit 34cdd2d7f5

View File

@ -543,13 +543,15 @@ pub fn handle_delete(server: &mut Server, entity: EcsEntity) {
pub fn handle_land_on_ground(server: &Server, entity: EcsEntity, vel: Vec3<f32>) { pub fn handle_land_on_ground(server: &Server, entity: EcsEntity, vel: Vec3<f32>) {
let ecs = server.state.ecs(); let ecs = server.state.ecs();
// The second part of this if statement disables all fall damage when in the water. This was // The second part of this if statement disables all fall damage when in the
// added as a *temporary* fix a bug that causes you to take fall damage while swimming downwards. // water. This was added as a *temporary* fix a bug that causes you to take
// FIXME: Fix the actual bug and remove the following relevant part of the if statement. // fall damage while swimming downwards. FIXME: Fix the actual bug and
if vel.z <= -30.0 && ecs // remove the following relevant part of the if statement.
.read_storage::<PhysicsState>() if vel.z <= -30.0
.get(entity) && ecs
.map_or(true, |ps| ps.in_liquid().is_none()) .read_storage::<PhysicsState>()
.get(entity)
.map_or(true, |ps| ps.in_liquid().is_none())
{ {
let char_states = ecs.read_storage::<CharacterState>(); let char_states = ecs.read_storage::<CharacterState>();