fix: fix issue where reroll could happen incorrectly

javalent · Oct 14, 2023 · ae212e4 · ae212e4
1 parent c13922d
commit ae212e4
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/roller/dice.ts b/src/roller/dice.ts
@@ -224,12 +224,7 @@ export class DiceRoller {
             toReroll = [...this.results].filter(([, { value }]) =>
                 this.checkCondition(value, conditionals)
             );
-        while (
-            i < times &&
-            toReroll.filter(([, { value }]) =>
-                this.checkCondition(value, conditionals)
-            ).length > 0
-        ) {
+        while (i < times && toReroll.length > 0) {
             i++;
             await Promise.all(
                 toReroll.map(async ([i, roll]) => {
@@ -240,6 +235,9 @@ export class DiceRoller {
                     roll.display = `${newValue}`;
                 })
             );
+            toReroll = toReroll.filter(([, { value }]) =>
+                this.checkCondition(value, conditionals)
+            );
         }
 
         toReroll.forEach(([index, value]) => {