patch braced commands

DenizenScript · Jun 27, 2018 · 31ff628 · 31ff628
1 parent 916ff71
commit 31ff628
Showing 1 changed file with 13 additions and 14 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
@@ -52,33 +52,32 @@ public static List<BracedData> getBracedCommands(ScriptEntry scriptEntry) {
 
         List<BracedData> entryBracedSet = scriptEntry.getBracedSet();
         if (entryBracedSet != null) {
-            boolean needsPatch = false;
-            for (BracedData bd : entryBracedSet) {
-                if (bd.needPatch) {
-                    needsPatch = true;
-                    break;
-                }
-            }
             List<BracedData> res = new ArrayList<BracedData>(entryBracedSet);
-            if (needsPatch) {
+            try {
                 for (int i = 0; i < res.size(); i++) {
+                    BracedData newbd = new BracedData();
                     BracedData bd = res.get(i);
+                    res.set(i, newbd);
+                    newbd.key = bd.key;
+                    newbd.value = new ArrayList<ScriptEntry>(bd.value.size());
+                    for (ScriptEntry sEntry : bd.value) {
+                        ScriptEntry newEntry = sEntry.clone();
+                        newEntry.entryData.transferDataFrom(scriptEntry.entryData);
+                        newbd.value.add(newEntry);
+                    }
                     if (bd.needPatch) {
-                        BracedData newbd = new BracedData();
-                        res.set(i, newbd);
-                        newbd.key = bd.key;
                         newbd.args = new ArrayList<String>(bd.args.size());
                         for (int x = bd.aStart; x <= bd.aEnd; x++) {
                             newbd.args.add(scriptEntry.args.get(x));
                         }
                         break;
                     }
                 }
-                return res;
             }
-            else {
-                return entryBracedSet;
+            catch (Exception e) {
+                dB.echoError(scriptEntry.getResidingQueue(), e);
             }
+            return res;
         }
 
         if (scriptEntry.getInsideList() != null) {