Merge branch 'velocity-fix' into 'master'

Fix velocity when stuck

See merge request veloren/veloren!453
This commit is contained in:
Timo Koesters 2019-08-21 17:42:02 +00:00
commit 1bb969ef36
2 changed files with 2 additions and 1 deletions

View File

@ -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

View File

@ -257,6 +257,7 @@ impl<'a> System<'a> for Sys {
if attempts == MAX_ATTEMPTS {
pos.0 = old_pos;
vel.0 = Vec3::zero();
break;
}
}