From 365f9cbaa7c7a1e1d5c015e058653af1575f11d6 Mon Sep 17 00:00:00 2001 From: mcmonkey4eva Date: Mon, 2 Sep 2013 20:01:28 -0700 Subject: [PATCH] Add same to repeat (Meant to put in this in the same commit, but I accidentally unchecked it on the github client. Woops!) --- .../denizen/scripts/commands/core/RepeatCommand.java | 3 +++ 1 file changed, 3 insertions(+) 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 index afdbc8826d..d1ca08beda 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RepeatCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RepeatCommand.java @@ -47,6 +47,8 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { dB.report(getName(), qty.debug()); for (int incr = 0; incr < qty.asInt(); incr++) { + if (scriptEntry.getResidingQueue().getWasCleared()) + return; ArrayList newEntries = (ArrayList) new ArrayList(); for (ScriptEntry entr: entries) { try { @@ -59,6 +61,7 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { } } ScriptQueue queue = new InstantQueue(UUID.randomUUID().toString()); + queue.addDefinition("parent_queue", scriptEntry.getResidingQueue().id); scriptEntry.getResidingQueue().addDefinition("value", String.valueOf(incr + 1)); queue.addDefinition("value", String.valueOf(incr + 1)); queue.addEntries(newEntries);