Fix nested node constraints only checking the first set

sarbian · Apr 24, 2016 · cc7f0a6 · cc7f0a6
1 parent c8ccaa7
commit cc7f0a6
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/moduleManager.cs b/moduleManager.cs
@@ -2772,9 +2772,21 @@ public static bool CheckConstraints(ConfigNode node, string constraints)
 
                         // @MODULE[ModuleAlternator] or !MODULE[ModuleAlternator]
                         bool not = (constraints[0] == '!');
-                        ConfigNode subNode = MMPatchLoader.FindConfigNodeIn(node, type, name);
-                        if (subNode != null)
-                            return not ^ CheckConstraints(subNode, remainingConstraints);
+
+                        bool any = false;
+                        int index = 0;
+                        ConfigNode last = null;
+                        while (true)
+                        {
+                            ConfigNode subNode = FindConfigNodeIn(node, type, name, index++);
+                            if (subNode == last || subNode == null)
+                                break;
+                            any = any || CheckConstraints(subNode, remainingConstraints);
+                            last = subNode;
+                        }
+                        if (last != null)
+                            return not ^ any;
+
                         return not ^ false;
 
                     case '#':