Allow consuming while moving (#7158)

2022-03-17 12:46:18 +11:00
parent 8ee1503861
commit dc85b4bc80
2 changed files with 8 additions and 4 deletions
--- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
@@ -232,12 +232,14 @@ namespace Content.Server.Nutrition.EntitySystems
            }

            drink.CancelToken = new CancellationTokenSource();
+            var moveBreak = user != target;
+
            _doAfterSystem.DoAfter(new DoAfterEventArgs(user, forceDrink ? drink.ForceFeedDelay : drink.Delay, drink.CancelToken.Token, target)
            {
-                BreakOnUserMove = true,
+                BreakOnUserMove = moveBreak,
                BreakOnDamage = true,
                BreakOnStun = true,
-                BreakOnTargetMove = true,
+                BreakOnTargetMove = moveBreak,
                MovementThreshold = 0.01f,
                TargetFinishedEvent = new DrinkEvent(user, drink, drinkSolution),
                BroadcastCancelledEvent = new DrinkCancelledEvent(drink),