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

Fix cable cutting and allow tool system to raise directed events (#6175)

Browse Source
This commit is contained in:
Leon Friedrich
2022-01-19 11:17:46 +13:00
committed by GitHub
parent 90a11e3b47
commit b89557bb49
2 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Power/EntitySystems/CableSystem.cs
View File

@@ -26,8 +26,8 @@ public class CableSystem : EntitySystem
if (args.Handled)
return;
var ev = new CuttingFinishedEvent(uid, args.User);
_toolSystem.UseTool(args.Used, args.User, uid, 0, cable.CuttingDelay, new[] { cable.CuttingQuality }, doAfterCompleteEvent: ev);
var ev = new CuttingFinishedEvent(args.User);
_toolSystem.UseTool(args.Used, args.User, uid, 0, cable.CuttingDelay, new[] { cable.CuttingQuality }, doAfterCompleteEvent: ev, doAfterEventTarget: uid);
args.Handled = true;
}
@@ -57,15 +57,12 @@ public class CableSystem : EntitySystem
}
}
// TODO: if #5887 gets merged, just use a directed event instead of broadcast-with-target
public class CuttingFinishedEvent : EntityEventArgs
{
public EntityUid Target;
public EntityUid User;
public CuttingFinishedEvent(EntityUid target, EntityUid user)
public CuttingFinishedEvent(EntityUid user)
{
Target = target;
User = user;
}
}