Don't pushback when throwing while buckled (#4232)

* Don't pushback when throwing while buckled * Address reviews * Fix
2021-06-28 14:17:08 +10:00
parent 50cc526ebd
commit 05e31c2cd3
3 changed files with 20 additions and 1 deletions
--- a/Content.Server/Throwing/ThrowHelper.cs
+++ b/Content.Server/Throwing/ThrowHelper.cs
@@ -54,7 +54,13 @@ namespace Content.Server.Throwing
            // Give thrower an impulse in the other direction
            if (user != null && pushbackRatio > 0.0f && user.TryGetComponent(out IPhysBody? body))
            {
-                body.ApplyLinearImpulse(-direction * pushbackRatio);
+                var msg = new ThrowPushbackAttemptEvent();
+                body.Owner.EntityManager.EventBus.RaiseLocalEvent(body.Owner.Uid, msg);
+
+                if (!msg.Cancelled)
+                {
+                    body.ApplyLinearImpulse(-direction * pushbackRatio);
+                }
            }
        }
    }