diff --git a/common/src/sys/phys.rs b/common/src/sys/phys.rs index e974fca9e4..cf913da4b6 100644 --- a/common/src/sys/phys.rs +++ b/common/src/sys/phys.rs @@ -33,7 +33,7 @@ fn integrate_forces(dt: f32, mut lv: Vec3<f32>, grav: f32, damp: f32) -> Vec3<f3 // must be interpolated accordingly let linear_damp = (1.0 - damp.min(1.0)).powf(dt * 60.0); - lv.z = (lv.z - grav * dt).max(-50.0); + lv.z = (lv.z - grav * dt).max(-80.0); lv * linear_damp } diff --git a/server/src/lib.rs b/server/src/lib.rs index eb44cad557..7a7f85eeed 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -624,11 +624,11 @@ impl Server { } ServerEvent::LandOnGround { entity, vel } => { - if vel.z <= -25.0 { + if vel.z <= -37.0 { if let Some(stats) = state.ecs().write_storage::<comp::Stats>().get_mut(entity) { - let falldmg = (vel.z / 5.0) as i32; + let falldmg = (vel.z / 2.5) as i32; if falldmg < 0 { stats.health.change_by(comp::HealthChange { amount: falldmg,