diff options
Diffstat (limited to 'BJC-Utils2/src/main/java/bjc/utils/dice')
| -rw-r--r-- | BJC-Utils2/src/main/java/bjc/utils/dice/CompoundDice.java | 7 | ||||
| -rw-r--r-- | BJC-Utils2/src/main/java/bjc/utils/dice/DiceExpressionParser.java | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/BJC-Utils2/src/main/java/bjc/utils/dice/CompoundDice.java b/BJC-Utils2/src/main/java/bjc/utils/dice/CompoundDice.java index 3dd70ff..4e2e9f3 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/dice/CompoundDice.java +++ b/BJC-Utils2/src/main/java/bjc/utils/dice/CompoundDice.java @@ -33,8 +33,11 @@ public class CompoundDice implements IDiceExpression { } public CompoundDice(String l, String r) { - this.l = ComplexDice.fromString(l); - this.r = ComplexDice.fromString(r); + this(ComplexDice.fromString(l), ComplexDice.fromString(r)); + } + + public CompoundDice(String[] exps) { + this(exps[0], exps[1]); } @Override diff --git a/BJC-Utils2/src/main/java/bjc/utils/dice/DiceExpressionParser.java b/BJC-Utils2/src/main/java/bjc/utils/dice/DiceExpressionParser.java index 12b85f7..a7d1f8c 100644 --- a/BJC-Utils2/src/main/java/bjc/utils/dice/DiceExpressionParser.java +++ b/BJC-Utils2/src/main/java/bjc/utils/dice/DiceExpressionParser.java @@ -67,9 +67,7 @@ public class DiceExpressionParser { && !tok.equalsIgnoreCase("c")) { String[] strangs = tok.split("c"); - dexps.push(new CompoundDice( - ComplexDice.fromString(strangs[0]), - ComplexDice.fromString(strangs[1]))); + dexps.push(new CompoundDice(strangs)); } else if (StringUtils.countMatches(tok, 'd') == 1 && !tok.equalsIgnoreCase("d")) { /* |