From f1a38d35bf24b362447dce31772e16bb9c9954aa Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Thu, 19 May 2022 12:39:46 +0200 Subject: [PATCH] Timing fix --- forge-game/src/main/java/forge/game/phase/PhaseHandler.java | 5 +---- .../forge/game/spellability/SpellAbilityRestriction.java | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java index 873392468b8..885646b5b37 100644 --- a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java +++ b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java @@ -431,6 +431,7 @@ public class PhaseHandler implements java.io.Serializable { } nUpkeepsThisTurn = 0; + nCombatsThisTurn = 0; nMain2sThisTurn = 0; game.getStack().resetMaxDistinctSources(); @@ -479,10 +480,6 @@ public class PhaseHandler implements java.io.Serializable { } switch (phase) { - case UNTAP: - nCombatsThisTurn = 0; - break; - case UPKEEP: for (Card c : game.getCardsIncludePhasingIn(ZoneType.Battlefield)) { c.getDamageHistory().setNotAttackedSinceLastUpkeepOf(playerTurn); diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java b/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java index 6e40b52e377..25a41f579c4 100644 --- a/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java +++ b/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java @@ -330,7 +330,7 @@ public class SpellAbilityRestriction extends SpellAbilityVariables { } if (this.getFirstCombatOnly()) { - if (game.getPhaseHandler().getNumCombat() > 1) { + if (game.getPhaseHandler().getNumCombat() > (game.getPhaseHandler().inCombat() ? 1 : 0)) { return false; } }