tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix drink DoAfter (#14437)

Browse Source 
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
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
View File

@@ -259,7 +259,6 @@ namespace Content.Server.Nutrition.EntitySystems
// log voluntary drinking // log voluntary drinking
_adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(target):target} is drinking {ToPrettyString(item):drink} {SolutionContainerSystem.ToPrettyString(drinkSolution)}"); _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); 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, var doAfterEventArgs = new DoAfterEventArgs(user, drink.ForceDrink ? drink.ForceFeedDelay : drink.Delay,
target: target, used: item) target: target, used: item)
{ {
BreakOnUserMove = moveBreak, RaiseOnTarget = drink.ForceDrink,
RaiseOnUser = !drink.ForceDrink,
BreakOnUserMove = drink.ForceDrink,
BreakOnDamage = true, BreakOnDamage = true,
BreakOnStun = true, BreakOnStun = true,
BreakOnTargetMove = moveBreak, BreakOnTargetMove = drink.ForceDrink,
MovementThreshold = 0.01f, MovementThreshold = 0.01f,
DistanceThreshold = 1.0f, DistanceThreshold = 1.0f,
NeedHand = true NeedHand = true