From 343ea93d75d72fb308e02e59bcd70e51d53965e7 Mon Sep 17 00:00:00 2001
From: Jacob Tong <10494922+ShadowCommander@users.noreply.github.com>
Date: Sun, 5 Mar 2023 23:52:10 -0800
Subject: [PATCH] Fix drink DoAfter (#14437)

Copies missing arguments from FoodSystem
---
 Content.Server/Nutrition/EntitySystems/DrinkSystem.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
index d919f926ce..b611ccdf7b 100644
--- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
@@ -259,7 +259,6 @@ namespace Content.Server.Nutrition.EntitySystems
                 // log voluntary drinking
                 _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(target):target} is drinking {ToPrettyString(item):drink} {SolutionContainerSystem.ToPrettyString(drinkSolution)}");
             }
-            var moveBreak = user != target;
 
             var flavors = _flavorProfileSystem.GetLocalizedFlavorsMessage(user, drinkSolution);
 
@@ -268,10 +267,12 @@ namespace Content.Server.Nutrition.EntitySystems
             var doAfterEventArgs = new DoAfterEventArgs(user, drink.ForceDrink ? drink.ForceFeedDelay : drink.Delay,
                 target: target, used: item)
             {
-                BreakOnUserMove = moveBreak,
+                RaiseOnTarget = drink.ForceDrink,
+                RaiseOnUser = !drink.ForceDrink,
+                BreakOnUserMove = drink.ForceDrink,
                 BreakOnDamage = true,
                 BreakOnStun = true,
-                BreakOnTargetMove = moveBreak,
+                BreakOnTargetMove = drink.ForceDrink,
                 MovementThreshold = 0.01f,
                 DistanceThreshold = 1.0f,
                 NeedHand = true