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

Add anchored checks to GetReachableNodes() for power device nodes (#5760)

Browse Source
This commit is contained in:
Caj Jones
2021-12-13 00:45:54 -05:00
committed by GitHub
parent f110e28021
commit 41a9bb1efa
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Power/Nodes/CableDeviceNode.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic; using System.Collections.Generic;
using Content.Server.NodeContainer.Nodes; using Content.Server.NodeContainer.Nodes;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
@@ -15,6 +15,9 @@ namespace Content.Server.Power.Nodes
{ {
public override IEnumerable<Node> GetReachableNodes() public override IEnumerable<Node> GetReachableNodes()
{ {
if (!Anchored)
yield break;
var entMan = IoCManager.Resolve<IEntityManager>(); var entMan = IoCManager.Resolve<IEntityManager>();
// If we're in an invalid grid, such as grid 0, we cannot connect to anything. // If we're in an invalid grid, such as grid 0, we cannot connect to anything.

5
Content.Server/Power/Nodes/CableTerminalNode.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic; using System.Collections.Generic;
using Content.Server.NodeContainer.Nodes; using Content.Server.NodeContainer.Nodes;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
@@ -12,6 +12,9 @@ namespace Content.Server.Power.Nodes
{ {
public override IEnumerable<Node> GetReachableNodes() public override IEnumerable<Node> GetReachableNodes()
{ {
if (!Anchored)
yield break;
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner).GridID == GridId.Invalid) if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner).GridID == GridId.Invalid)
yield break; // No funny nodes in spess. yield break; // No funny nodes in spess.

5
Content.Server/Power/Nodes/CableTerminalPortNode.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic; using System.Collections.Generic;
using Content.Server.NodeContainer.Nodes; using Content.Server.NodeContainer.Nodes;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
@@ -12,6 +12,9 @@ namespace Content.Server.Power.Nodes
{ {
public override IEnumerable<Node> GetReachableNodes() public override IEnumerable<Node> GetReachableNodes()
{ {
if (!Anchored)
yield break;
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner).GridID == GridId.Invalid) if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner).GridID == GridId.Invalid)
yield break; // No funny nodes in spess. yield break; // No funny nodes in spess.