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

thresholds (#9960)

Browse Source
This commit is contained in:
Nemanja
2022-07-24 07:33:52 -04:00
committed by GitHub
parent 13b5b576e4
commit 97d131f5d7
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -262,13 +262,14 @@ namespace Content.Server.Nutrition.EntitySystems
drink.CancelToken = new CancellationTokenSource(); drink.CancelToken = new CancellationTokenSource();
var moveBreak = user != target; var moveBreak = user != target;
_doAfterSystem.DoAfter(new DoAfterEventArgs(user, forceDrink ? drink.ForceFeedDelay : drink.Delay, drink.CancelToken.Token, target) _doAfterSystem.DoAfter(new DoAfterEventArgs(user, forceDrink ? drink.ForceFeedDelay : drink.Delay, drink.CancelToken.Token, target, drink.Owner)
{ {
BreakOnUserMove = moveBreak, BreakOnUserMove = moveBreak,
BreakOnDamage = true, BreakOnDamage = true,
BreakOnStun = true, BreakOnStun = true,
BreakOnTargetMove = moveBreak, BreakOnTargetMove = moveBreak,
MovementThreshold = 0.01f, MovementThreshold = 0.01f,
DistanceThreshold = 1.0f,
TargetFinishedEvent = new DrinkEvent(user, drink, drinkSolution), TargetFinishedEvent = new DrinkEvent(user, drink, drinkSolution),
BroadcastCancelledEvent = new DrinkCancelledEvent(drink), BroadcastCancelledEvent = new DrinkCancelledEvent(drink),
NeedHand = true, NeedHand = true,

2
Content.Server/Nutrition/EntitySystems/FoodSystem.cs
View File

@@ -132,7 +132,7 @@ namespace Content.Server.Nutrition.EntitySystems
BreakOnStun = true, BreakOnStun = true,
BreakOnTargetMove = moveBreak, BreakOnTargetMove = moveBreak,
MovementThreshold = 0.01f, MovementThreshold = 0.01f,
DistanceThreshold = 2.0f, DistanceThreshold = 1.0f,
TargetFinishedEvent = new FeedEvent(user, food, foodSolution, utensils), TargetFinishedEvent = new FeedEvent(user, food, foodSolution, utensils),
BroadcastCancelledEvent = new ForceFeedCancelledEvent(food), BroadcastCancelledEvent = new ForceFeedCancelledEvent(food),
NeedHand = true, NeedHand = true,