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

Fix UtensilComponent interaction returning true even when doing nothing

Browse Source
This commit is contained in:
DrSmugleaf
2021-03-26 16:00:03 +01:00
parent a6f04e22e4
commit ec7eab2989
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Server/GameObjects/Components/Culinary/UtensilComponent.cs
View File

@@ -4,7 +4,6 @@ using System.Threading.Tasks;
using Content.Server.GameObjects.Components.Nutrition; using Content.Server.GameObjects.Components.Nutrition;
using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Interfaces.GameObjects.Components;
using Content.Shared.Utility; using Content.Shared.Utility;
using Robust.Server.GameObjects;
using Robust.Shared.Audio; using Robust.Shared.Audio;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
@@ -82,23 +81,23 @@ namespace Content.Server.GameObjects.Components.Culinary
async Task<bool> IAfterInteract.AfterInteract(AfterInteractEventArgs eventArgs) async Task<bool> IAfterInteract.AfterInteract(AfterInteractEventArgs eventArgs)
{ {
TryUseUtensil(eventArgs.User, eventArgs.Target); return TryUseUtensil(eventArgs.User, eventArgs.Target);
return true;
} }
private void TryUseUtensil(IEntity user, IEntity? target) private bool TryUseUtensil(IEntity user, IEntity? target)
{ {
if (target == null || !target.TryGetComponent(out FoodComponent? food)) if (target == null || !target.TryGetComponent(out FoodComponent? food))
{ {
return; return false;
} }
if (!user.InRangeUnobstructed(target, popup: true)) if (!user.InRangeUnobstructed(target, popup: true))
{ {
return; return false;
} }
food.TryUseFood(user, null, this); food.TryUseFood(user, null, this);
return true;
} }
} }