Fix drink DoAfter (#14437)

Copies missing arguments from FoodSystem
This commit is contained in:
Jacob Tong 2023-03-05 23:52:10 -08:00 committed by GitHub
parent 758e2bb3f5
commit 343ea93d75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions

View File

@ -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