fix if command old defs

DenizenScript · Nov 22, 2018 · 07ff846 · 07ff846
1 parent e039bb1
commit 07ff846
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/net/aufdemrand/denizencore/scripts/commands/BracedCommand.java b/src/main/java/net/aufdemrand/denizencore/scripts/commands/BracedCommand.java
@@ -60,17 +60,20 @@ public static List<BracedData> getBracedCommands(ScriptEntry scriptEntry) {
                     res.set(i, newbd);
                     newbd.key = bd.key;
                     newbd.value = new ArrayList<ScriptEntry>(bd.value.size());
+                    newbd.needPatch = bd.needPatch;
                     for (ScriptEntry sEntry : bd.value) {
                         ScriptEntry newEntry = sEntry.clone();
                         newEntry.entryData.transferDataFrom(scriptEntry.entryData);
                         newbd.value.add(newEntry);
                     }
+                    if (dB.verbose) {
+                        dB.echoDebug(scriptEntry, "Wrangling braced command args[" + bd.needPatch + "]: " + bd.key);
+                    }
                     if (bd.needPatch) {
                         newbd.args = new ArrayList<String>(bd.args.size());
                         for (int x = bd.aStart; x <= bd.aEnd; x++) {
                             newbd.args.add(CommandExecuter.parseDefsRaw(scriptEntry, scriptEntry.args.get(x)));
                         }
-                        break;
                     }
                     else {
                         newbd.args = bd.args;
@@ -215,7 +218,7 @@ else if (arg.equals("}")) {
                         }
                     }
                     if (hyperdebug) {
-                        dB.echoDebug(scriptEntry, "Adding section " + bracesName);
+                        dB.echoDebug(scriptEntry, "Adding section " + bracesName + " with " + tStart + " to " + tEnd);
                     }
                     bd.args = bracesArgs;
                     bd.aStart = tStart;
@@ -228,6 +231,7 @@ else if (arg.equals("}")) {
                     commandList = new TreeMap<Integer, ArrayList<String>>();
                     tEnd = -1;
                     tStart = i + 1;
+                    tPatchMe = false;
                 }
             }