From 3ec1c7e7386d6c7b17a50782fff7151963d7f656 Mon Sep 17 00:00:00 2001 From: Vechro Date: Wed, 21 Aug 2019 20:17:19 +0300 Subject: [PATCH 1/2] Fix velocity when stuck --- common/src/sys/phys.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/common/src/sys/phys.rs b/common/src/sys/phys.rs index 89cfceecdd..a60a78ca39 100644 --- a/common/src/sys/phys.rs +++ b/common/src/sys/phys.rs @@ -257,6 +257,7 @@ impl<'a> System<'a> for Sys { if attempts == MAX_ATTEMPTS { pos.0 = old_pos; + vel.0 = Vec3::zero(); break; } } From 83c4232279b919959a9f411d6412204f5e09f2fc Mon Sep 17 00:00:00 2001 From: Vechro Date: Wed, 21 Aug 2019 20:34:21 +0300 Subject: [PATCH 2/2] Fix wielding jump issue --- common/src/sys/movement.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/sys/movement.rs b/common/src/sys/movement.rs index 6f0471f0bb..5fadb37a4c 100644 --- a/common/src/sys/movement.rs +++ b/common/src/sys/movement.rs @@ -97,7 +97,7 @@ impl<'a> System<'a> for Sys { { HUMANOID_AIR_ACCEL } - (true, false, true, false) + (true, false, true, _) if vel.0.magnitude_squared() < ROLL_SPEED.powf(2.0) => { ROLL_ACCEL