Merge pull request #1854 from gereon77/fix-doran-turn-skipped-detection

Fix turn skipped detection
Longwelwind · Jul 6, 2024 · 0ec6994 · 0ec6994
2 parents 7a8f951 + 935134b
commit 0ec6994
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...es-resolution-game-state/doran-martell-ability-game-state/DoranMartellAbilityGameState.ts b/...es-resolution-game-state/doran-martell-ability-game-state/DoranMartellAbilityGameState.ts
@@ -94,7 +94,9 @@ export default class DoranMartellAbilityGameState extends GameState<
             currentIndex = (currentIndex + 1) % numberOfHouses;
             const currentHouseToCheck = turnOrder[currentIndex];
 
-            const regions = this.combatGameState.actionGameState.getRegionsWithMarchOrderOfHouse(currentHouseToCheck);
+            const regions = this.combatGameState.actionGameState.getRegionsWithMarchOrderOfHouse(currentHouseToCheck)
+                // Filter out the march order that initiated the combat
+                .filter(r => r != this.combatGameState.attackingRegion);
             if (regions.length > 0) {
                 return currentHouseToCheck;
             }