From e6e1953990dc36e5f9f8c5025c95d683881be8a7 Mon Sep 17 00:00:00 2001 From: Jeremy Schroeder Date: Wed, 26 Jun 2013 16:23:04 -0400 Subject: [PATCH] Fixes to IF using a stripped argument. --- .../denizen/scripts/commands/core/IfCommand.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/IfCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/IfCommand.java index 237a471e51..9a511ece04 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/IfCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/IfCommand.java @@ -128,7 +128,7 @@ else if (arg.matches("{")) { bracketsEntered++; if (bracketsEntered > 1) { - thenOutcome.get(thenOutcome.lastKey()).add(arg.getValue()); + thenOutcome.get(thenOutcome.lastKey()).add(arg.raw_value); } } @@ -136,7 +136,7 @@ else if (arg.matches("}")) { bracketsEntered--; if (bracketsEntered > 0) { - thenOutcome.get(thenOutcome.lastKey()).add(arg.getValue()); + thenOutcome.get(thenOutcome.lastKey()).add(arg.raw_value); } } @@ -144,13 +144,13 @@ else if (arg.matches("}")) { // or if there are no outcome commands yet else if (newCommand == true || thenOutcome.size() == 0) { thenOutcome.put(thenOutcome.size(), new ArrayList()); - thenOutcome.get(thenOutcome.lastKey()).add(arg.getValue()); + thenOutcome.get(thenOutcome.lastKey()).add(arg.raw_value); newCommand = false; } // Add new outcome argument else { - thenOutcome.get(thenOutcome.lastKey()).add(arg.getValue()); + thenOutcome.get(thenOutcome.lastKey()).add(arg.raw_value); } } @@ -163,7 +163,7 @@ else if (insideElse) { bracketsEntered++; if (bracketsEntered > 1) { - elseOutcome.get(elseOutcome.lastKey()).add(arg.getValue()); + elseOutcome.get(elseOutcome.lastKey()).add(arg.raw_value); } } @@ -171,7 +171,7 @@ else if (arg.matches("}")) { bracketsEntered--; if (bracketsEntered > 0) { - elseOutcome.get(elseOutcome.lastKey()).add(arg.getValue()); + elseOutcome.get(elseOutcome.lastKey()).add(arg.raw_value); } } @@ -180,7 +180,7 @@ else if (arg.matches("}")) { else if (newCommand == true || elseOutcome.size() == 0) { newCommand = false; elseOutcome.put(elseOutcome.size(), new ArrayList()); - elseOutcome.get(elseOutcome.lastKey()).add(arg.getValue()); + elseOutcome.get(elseOutcome.lastKey()).add(arg.raw_value); // Important! // @@ -194,7 +194,7 @@ else if (newCommand == true || elseOutcome.size() == 0) { // Add new else argument else { - elseOutcome.get(elseOutcome.lastKey()).add(arg.getValue()); + elseOutcome.get(elseOutcome.lastKey()).add(arg.raw_value); } } }