Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Round 4 of Doafter fixes (#14476)

Browse Source
This commit is contained in:
keronshb
2023-03-09 03:45:19 -05:00
committed by GitHub
parent c7c5704aeb
commit 5e8bd137f6
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,7 +134,7 @@ namespace Content.Server.Nutrition.EntitySystems
var doAfterEventArgs = new DoAfterEventArgs(user, foodComp.ForceFeed ? foodComp.ForceFeedDelay : foodComp.Delay, target: target, used: food)
{
RaiseOnTarget = foodComp.ForceFeed,
RaiseOnUser = !foodComp.ForceFeed,
RaiseOnUser = false, //causes a crash if mice eat if true
BreakOnUserMove = foodComp.ForceFeed,
BreakOnDamage = true,
BreakOnStun = true,
@@ -160,7 +160,7 @@ namespace Content.Server.Nutrition.EntitySystems
return;
}
if (args.Cancelled || args.Handled || component.Deleted || args.Args.Target == null)
if (args.Handled || component.Deleted || args.Args.Target == null)
return;
if (!TryComp<BodyComponent>(args.Args.Target.Value, out var body))
@@ -202,6 +202,7 @@ namespace Content.Server.Nutrition.EntitySystems
// log successful force feed
_adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(uid):user} forced {ToPrettyString(args.Args.User):target} to eat {ToPrettyString(uid):food}");
component.ForceFeed = false;
}
else
{