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

Fix sync UseTool not calling ToolFinishUse when there's a DoAfter.

Browse Source 
Fixes #5060
This commit is contained in:
Vera Aguilera Puerto
2021-10-28 11:21:43 +02:00
parent f12cec3f98
commit 335c461442
1 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Content.Server/Tools/ToolSystem.cs
View File

@@ -33,6 +33,21 @@ namespace Content.Server.Tools
InitializeWelders();
InitializeMultipleTools();
SubscribeLocalEvent<ToolDoAfterComplete>(OnDoAfterComplete);
SubscribeLocalEvent<ToolDoAfterCancelled>(OnDoAfterCancelled);
}
private void OnDoAfterComplete(ToolDoAfterComplete ev)
{
// Actually finish the tool use! Depending on whether that succeeds or not, either event will be broadcast.
RaiseLocalEvent(ToolFinishUse(ev.Uid, ev.UserUid, ev.Fuel) ? ev.CompletedEvent : ev.CancelledEvent);
}
private void OnDoAfterCancelled(ToolDoAfterCancelled ev)
{
// Broadcast wrapped event.
RaiseLocalEvent(ev.Event);
}
/// <summary>
@@ -89,8 +104,8 @@ namespace Content.Server.Tools
BreakOnTargetMove = true,
BreakOnUserMove = true,
NeedHand = true,
BroadcastFinishedEvent = doAfterCompleteEvent,
BroadcastCancelledEvent = doAfterCancelledEvent,
BroadcastFinishedEvent = new ToolDoAfterComplete(doAfterCompleteEvent, doAfterCancelledEvent, tool, user, fuel),
BroadcastCancelledEvent = new ToolDoAfterCancelled(doAfterCancelledEvent),
};
_doAfterSystem.DoAfter(doAfterArgs);
@@ -213,6 +228,34 @@ namespace Content.Server.Tools
UpdateWelders(frameTime);
}
private class ToolDoAfterComplete : EntityEventArgs
{
public readonly object CompletedEvent;
public readonly object CancelledEvent;
public readonly EntityUid Uid;
public readonly EntityUid UserUid;
public readonly float Fuel;
public ToolDoAfterComplete(object completedEvent, object cancelledEvent, EntityUid uid, EntityUid userUid, float fuel)
{
CompletedEvent = completedEvent;
Uid = uid;
UserUid = userUid;
Fuel = fuel;
CancelledEvent = cancelledEvent;
}
}
private class ToolDoAfterCancelled : EntityEventArgs
{
public readonly object Event;
public ToolDoAfterCancelled(object @event)
{
Event = @event;
}
}
}
/// <summary>