Fix foreach/repeat context

DenizenScript · Sep 16, 2013 · b845d2f · b845d2f
1 parent 9c39235
commit b845d2f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ForEachCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/ForEachCommand.java
@@ -69,6 +69,7 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
             queue.addDefinition("parent_queue", scriptEntry.getResidingQueue().id);
             scriptEntry.getResidingQueue().addDefinition("value", value);
             queue.addDefinition("value", value);
+            queue.getAllDefinitions().putAll(scriptEntry.getResidingQueue().getAllDefinitions());
             queue.addEntries(newEntries);
             queue.start();
         }

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RepeatCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RepeatCommand.java
@@ -66,6 +66,7 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
             queue.addDefinition("parent_queue", scriptEntry.getResidingQueue().id);
             scriptEntry.getResidingQueue().addDefinition("value", String.valueOf(incr + 1));
             queue.addDefinition("value", String.valueOf(incr + 1));
+            queue.getAllDefinitions().putAll(scriptEntry.getResidingQueue().getAllDefinitions());
             queue.addEntries(newEntries);
             queue.start();
         }