Fix intermittent issue with loop removal

StarCoreSE · Apr 27, 2024 · 0c47ab0 · 0c47ab0
1 parent 864c93d
commit 0c47ab0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/Data/Scripts/AssemblyScripts/AssemblyComponents/AssemblyPart.cs b/Data/Scripts/AssemblyScripts/AssemblyComponents/AssemblyPart.cs
@@ -53,7 +53,7 @@ public void DoConnectionCheck(bool cascadingUpdate = false, HashSet<AssemblyPart
             if (visited == null)
                 visited = new HashSet<AssemblyPart>();
 
-            if (!visited.Add(this))
+            if (!visited.Add(this)) // I don't think this is actually doing a ton but it doesn't hurt really either?
                 return;
 
             ConnectedParts = GetValidNeighborParts();
@@ -115,11 +115,13 @@ public void DoConnectionCheck(bool cascadingUpdate = false, HashSet<AssemblyPart
 
             // Trigger cascading update
             if (IsBaseBlock || cascadingUpdate)
+            {
                 //debug notification begone
                 //MyAPIGateway.Utilities.ShowNotification("" + GetValidNeighborParts().Count);
                 foreach (var neighbor in GetValidNeighborParts())
                     if (neighbor.MemberAssembly == null)
                         neighbor.DoConnectionCheck(true, visited);
+            }
         }
 
         public void PartRemoved(bool notifyMods = true)

diff --git a/Data/Scripts/AssemblyScripts/AssemblyComponents/PhysicalAssembly.cs b/Data/Scripts/AssemblyScripts/AssemblyComponents/PhysicalAssembly.cs
@@ -67,10 +67,10 @@ public void AddPart(AssemblyPart part)
 
         public void RemovePart(AssemblyPart part)
         {
-            if (part == null || _componentParts == null)
+            if (!_componentParts?.Remove(part) ?? true)
                 return;
 
-            if (!_componentParts.Remove(part))
+            if (part == null)
                 return;
 
             var neighbors = part.ConnectedParts;
@@ -107,7 +107,8 @@ public void RemovePart(AssemblyPart part)
             {
                 if (!largestLoop.Contains(componentPart))
                 {
-                    RemovePart(componentPart);
+                    if (_componentParts?.Remove(componentPart) ?? false)
+                        AssemblyPartManager.I.QueueConnectionCheck(componentPart);
                 }
             }
         }