From 9942da031ad2c36c586f734e8b5d7c8e8f778da8 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Thu, 10 Feb 2022 19:21:57 +1300
Subject: [PATCH] Fix manual valve (#6532)

---
 Content.Server/NodeContainer/Nodes/PipeNode.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Content.Server/NodeContainer/Nodes/PipeNode.cs b/Content.Server/NodeContainer/Nodes/PipeNode.cs
index 780c2974e1..f67e78e587 100644
--- a/Content.Server/NodeContainer/Nodes/PipeNode.cs
+++ b/Content.Server/NodeContainer/Nodes/PipeNode.cs
@@ -38,20 +38,22 @@ namespace Content.Server.NodeContainer.Nodes
 
         public void AddAlwaysReachable(PipeNode pipeNode)
         {
-            if (NodeGroup == null) return;
             if (pipeNode.NodeGroupID != NodeGroupID) return;
             _alwaysReachable ??= new();
             _alwaysReachable.Add(pipeNode);
-            EntitySystem.Get<NodeGroupSystem>().QueueRemakeGroup((BaseNodeGroup) NodeGroup);
+
+            if (NodeGroup != null)
+                EntitySystem.Get<NodeGroupSystem>().QueueRemakeGroup((BaseNodeGroup) NodeGroup);
         }
 
         public void RemoveAlwaysReachable(PipeNode pipeNode)
         {
             if (_alwaysReachable == null) return;
-            if (NodeGroup == null) return;
-            if (pipeNode.NodeGroupID != NodeGroupID) return;
+
             _alwaysReachable.Remove(pipeNode);
-            EntitySystem.Get<NodeGroupSystem>().QueueRemakeGroup((BaseNodeGroup) NodeGroup);
+
+            if (NodeGroup != null)
+                EntitySystem.Get<NodeGroupSystem>().QueueRemakeGroup((BaseNodeGroup) NodeGroup);
         }
 
         /// <summary>