rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow consuming while moving (#7158)

Browse source
This commit is contained in:
metalgearsloth 2022-03-17 12:46:18 +11:00 • committed by GitHub
parent 8ee1503861
commit dc85b4bc80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
View file

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

6
Content.Server/Nutrition/EntitySystems/FoodSystem.cs
View file

@ -127,12 +127,14 @@ namespace Content.Server.Nutrition.EntitySystems
_logSystem.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(user):user} is forcing {ToPrettyString(target):target} to eat {ToPrettyString(food.Owner):food} {SolutionContainerSystem.ToPrettyString(foodSolution)}");
}
var moveBreak = user != target;
_doAfterSystem.DoAfter(new DoAfterEventArgs(user, forceFeed ? food.ForceFeedDelay : food.Delay, food.CancelToken.Token, target)
{
BreakOnUserMove = true,
BreakOnUserMove = moveBreak,
BreakOnDamage = true,
BreakOnStun = true,
BreakOnTargetMove = true,
BreakOnTargetMove = moveBreak,
MovementThreshold = 0.01f,
TargetFinishedEvent = new FeedEvent(user, food, foodSolution, utensils),
BroadcastCancelledEvent = new ForceFeedCancelledEvent(food),