Fix pulling lerping (#4550)

2021-09-02 12:35:16 +10:00
parent 744b4e5ce6
commit 5ade8c2695
3 changed files with 31 additions and 1 deletions
--- a/Content.Shared/Movement/SharedMoverController.cs
+++ b/Content.Shared/Movement/SharedMoverController.cs
@@ -152,6 +152,8 @@ namespace Content.Shared.Movement
        {
            return body.BodyStatus == BodyStatus.OnGround &&
                   body.Owner.HasComponent<IMobStateComponent>() &&
+                   // If we're being pulled then don't mess with our velocity.
+                   (!body.Owner.TryGetComponent(out SharedPullableComponent? pullable) || !pullable.BeingPulled) &&
                   _blocker.CanMove(body.Owner);
        }