From 41a9bb1efae511700d899faece24909412c36dc0 Mon Sep 17 00:00:00 2001 From: Caj Jones Date: Mon, 13 Dec 2021 00:45:54 -0500 Subject: [PATCH] Add anchored checks to GetReachableNodes() for power device nodes (#5760) --- Content.Server/Power/Nodes/CableDeviceNode.cs | 5 ++++- Content.Server/Power/Nodes/CableTerminalNode.cs | 5 ++++- Content.Server/Power/Nodes/CableTerminalPortNode.cs | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Content.Server/Power/Nodes/CableDeviceNode.cs b/Content.Server/Power/Nodes/CableDeviceNode.cs index d8c4c217ef..cbefeead6d 100644 --- a/Content.Server/Power/Nodes/CableDeviceNode.cs +++ b/Content.Server/Power/Nodes/CableDeviceNode.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using Content.Server.NodeContainer.Nodes; using Robust.Shared.GameObjects; using Robust.Shared.IoC; @@ -15,6 +15,9 @@ namespace Content.Server.Power.Nodes { public override IEnumerable GetReachableNodes() { + if (!Anchored) + yield break; + var entMan = IoCManager.Resolve(); // If we're in an invalid grid, such as grid 0, we cannot connect to anything. diff --git a/Content.Server/Power/Nodes/CableTerminalNode.cs b/Content.Server/Power/Nodes/CableTerminalNode.cs index 17351ec7eb..6df4196cb8 100644 --- a/Content.Server/Power/Nodes/CableTerminalNode.cs +++ b/Content.Server/Power/Nodes/CableTerminalNode.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using Content.Server.NodeContainer.Nodes; using Robust.Shared.GameObjects; using Robust.Shared.IoC; @@ -12,6 +12,9 @@ namespace Content.Server.Power.Nodes { public override IEnumerable GetReachableNodes() { + if (!Anchored) + yield break; + if (IoCManager.Resolve().GetComponent(Owner).GridID == GridId.Invalid) yield break; // No funny nodes in spess. diff --git a/Content.Server/Power/Nodes/CableTerminalPortNode.cs b/Content.Server/Power/Nodes/CableTerminalPortNode.cs index e1cf189f11..01f090185e 100644 --- a/Content.Server/Power/Nodes/CableTerminalPortNode.cs +++ b/Content.Server/Power/Nodes/CableTerminalPortNode.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using Content.Server.NodeContainer.Nodes; using Robust.Shared.GameObjects; using Robust.Shared.IoC; @@ -12,6 +12,9 @@ namespace Content.Server.Power.Nodes { public override IEnumerable GetReachableNodes() { + if (!Anchored) + yield break; + if (IoCManager.Resolve().GetComponent(Owner).GridID == GridId.Invalid) yield break; // No funny nodes in spess.