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

Ensure wires can always be cut (#32447)

Browse Source 
ensure wires are always cut
This commit is contained in:
goet
2024-11-23 12:41:37 +01:00
committed by GitHub
parent 45af6a13fc
commit 855547a2d4
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Wires/ComponentWireAction.cs
View File

@@ -22,13 +22,14 @@ public abstract partial class ComponentWireAction<TComponent> : BaseWireAction w
public override bool Cut(EntityUid user, Wire wire) public override bool Cut(EntityUid user, Wire wire)
{ {
base.Cut(user, wire); base.Cut(user, wire);
return EntityManager.TryGetComponent(wire.Owner, out TComponent? component) && Cut(user, wire, component); // if the entity doesn't exist, we need to return true otherwise the wire sprite is never updated
return EntityManager.TryGetComponent(wire.Owner, out TComponent? component) ? Cut(user, wire, component) : true;
} }
public override bool Mend(EntityUid user, Wire wire) public override bool Mend(EntityUid user, Wire wire)
{ {
base.Mend(user, wire); base.Mend(user, wire);
return EntityManager.TryGetComponent(wire.Owner, out TComponent? component) && Mend(user, wire, component); return EntityManager.TryGetComponent(wire.Owner, out TComponent? component) ? Mend(user, wire, component) : true;
} }
public override void Pulse(EntityUid user, Wire wire) public override void Pulse(EntityUid user, Wire wire)