From 7e5c764b508bf8da64f415e435e0fc4ace7f94df Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Sun, 27 May 2018 23:39:14 +0200 Subject: [PATCH] Make power node not die on map load. --- .../Components/Power/PowerNodeComponent.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Content.Server/GameObjects/Components/Power/PowerNodeComponent.cs b/Content.Server/GameObjects/Components/Power/PowerNodeComponent.cs index 7e51d77a52..0c400f1d27 100644 --- a/Content.Server/GameObjects/Components/Power/PowerNodeComponent.cs +++ b/Content.Server/GameObjects/Components/Power/PowerNodeComponent.cs @@ -51,6 +51,10 @@ namespace Content.Server.GameObjects.Components.Power /// public void TryCreatePowernetConnection() { + if (Parent != null) + { + return; + } var _emanager = IoCManager.Resolve(); var position = Owner.GetComponent().WorldPosition; var wires = _emanager.GetEntitiesIntersecting(Owner) @@ -58,7 +62,13 @@ namespace Content.Server.GameObjects.Components.Power .OrderByDescending(x => (x.GetComponent().WorldPosition - position).Length); var choose = wires.FirstOrDefault(); if (choose != null) - ConnectToPowernet(choose.GetComponent().Parent); + { + var transfer = choose.GetComponent(); + if (transfer.Parent != null) + { + ConnectToPowernet(transfer.Parent); + } + } } ///