From e63d991a5d5b9bed027b2336760bdaa6f45ff9f5 Mon Sep 17 00:00:00 2001
From: Treeco <5021038-Treeco@users.noreply.gitlab.com>
Date: Thu, 9 Jul 2020 15:46:00 +0100
Subject: [PATCH] Reset rather than accumulate velocity when stuck or in
 unloaded chunks

---
 common/src/sys/phys.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/src/sys/phys.rs b/common/src/sys/phys.rs
index d57ef92df1..560adeb196 100644
--- a/common/src/sys/phys.rs
+++ b/common/src/sys/phys.rs
@@ -134,6 +134,7 @@ impl<'a> System<'a> for Sys {
                 let dt_lerp = 0.2;
                 (vel.0 * dt_lerp + old_vel.0 * (1.0 - dt_lerp)) * dt.0
             } else {
+                vel.0 = Vec3::zero();
                 Vec3::zero()
             };
 
@@ -319,6 +320,7 @@ impl<'a> System<'a> for Sys {
                         }
 
                         if attempts == MAX_ATTEMPTS {
+                            vel.0 = Vec3::zero();
                             pos.0 = old_pos;
                             break;
                         }