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

Fix cable unanchor bug (#6159)

Browse Source
This commit is contained in:
Leon Friedrich
2022-01-15 05:26:52 +13:00
committed by GitHub
parent d10bb563c7
commit 2947b33481
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@ public class CableSystem : EntitySystem
return; return;
Spawn(cable.CableDroppedOnCutPrototype, Transform(uid).Coordinates); Spawn(cable.CableDroppedOnCutPrototype, Transform(uid).Coordinates);
Del(uid); QueueDel(uid);
} }
private void OnAnchorChanged(EntityUid uid, CableComponent cable, ref AnchorStateChangedEvent args) private void OnAnchorChanged(EntityUid uid, CableComponent cable, ref AnchorStateChangedEvent args)
@@ -45,10 +45,15 @@ public class CableSystem : EntitySystem
if (args.Anchored) if (args.Anchored)
return; // huh? it wasn't anchored? return; // huh? it wasn't anchored?
// anchor state can change as a result of deletion (detach to null).
// We don't want to spawn an entity when deleted.
if (!TryLifeStage(uid, out var life) || life >= EntityLifeStage.Terminating)
return;
// This entity should not be un-anchorable. But this can happen if the grid-tile is deleted (RCD, explosion, // This entity should not be un-anchorable. But this can happen if the grid-tile is deleted (RCD, explosion,
// etc). In that case: behave as if the cable had been cut. // etc). In that case: behave as if the cable had been cut.
Spawn(cable.CableDroppedOnCutPrototype, Transform(uid).Coordinates); Spawn(cable.CableDroppedOnCutPrototype, Transform(uid).Coordinates);
Del(uid); QueueDel(uid);
} }
} }