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

Fix welder interaction (#14704)

Browse Source
This commit is contained in:
08A
2023-03-23 18:08:46 +01:00
committed by GitHub
parent f919361ed5
commit 4290577d5d
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Shared/Tools/Systems/SharedToolSystem.MultipleTool.cs
View File

@@ -35,7 +35,7 @@ public abstract class SharedToolSystem : EntitySystem
if (args.Handled || args.AdditionalData.Ev == null)
return;
if (args.Cancelled)
if (args.Cancelled || !ToolFinishUse(uid, args.Args.User, args.AdditionalData.Fuel))
{
if (args.AdditionalData.CancelledEv != null)
{
@@ -50,15 +50,12 @@ public abstract class SharedToolSystem : EntitySystem
return;
}
if (ToolFinishUse(uid, args.Args.User, args.AdditionalData.Fuel))
{
if (args.AdditionalData.TargetEntity != null)
RaiseLocalEvent(args.AdditionalData.TargetEntity.Value, args.AdditionalData.Ev);
else
RaiseLocalEvent(args.AdditionalData.Ev);
if (args.AdditionalData.TargetEntity != null)
RaiseLocalEvent(args.AdditionalData.TargetEntity.Value, args.AdditionalData.Ev);
else
RaiseLocalEvent(args.AdditionalData.Ev);
args.Handled = true;
}
args.Handled = true;
}
public bool UseTool(EntityUid tool, EntityUid user, EntityUid? target, float doAfterDelay, IEnumerable<string> toolQualitiesNeeded, ToolEventData toolEventData, float fuel = 0f, ToolComponent? toolComponent = null, Func<bool>? doAfterCheck = null, CancellationTokenSource? cancelToken = null)