Added code for !key,* = DEL and fixed group nr. 5

sarbian · Jan 1, 2016 · 37c7595 · 37c7595
1 parent f32b316
commit 37c7595
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/moduleManager.cs b/moduleManager.cs
@@ -1556,7 +1556,7 @@ public ConfigNode ModifyNode(ConfigNode original, ConfigNode mod)
                         {
                             if (match.Groups[2].Success)
                                 log("Error - Cannot use index with replace (%) value: " + mod.name);
-                            if (match.Groups[3].Success)
+                            if (match.Groups[5].Success)
                                 log("Error - Cannot use operators with replace (%) value: " + mod.name);
                             if (valName.Contains('*') || valName.Contains('?'))
                                 log("Error - Cannot use wildcards (* or ?) with replace (%) value: " + mod.name);
@@ -1618,17 +1618,22 @@ public ConfigNode ModifyNode(ConfigNode original, ConfigNode mod)
                         break;
 
                     case Command.Delete:
-                        if (match.Groups[3].Success)
+                        if (match.Groups[5].Success)
                         {
                             log("Error - Cannot use operators with delete (- or !) value: " + mod.name);
                             errorCount++;
                         }
                         else if (match.Groups[2].Success)
                         {
-                            // If there is an index, use it.
-                            ConfigNode.Value v = FindValueIn(newNode, valName, index);
-                            if (v != null)
-                                newNode.values.Remove(v);
+                            while (index < newNode.values.Count)
+                            {
+                                // If there is an index, use it.
+                                ConfigNode.Value v = FindValueIn(newNode, valName, index);
+                                if (v != null)
+                                    newNode.values.Remove(v);
+                                if (isStar) index++;
+                                else break;
+                            }
                         }
                         else if (valName.Contains('*') || valName.Contains('?'))
                         {