From aa7e3122293b1cfab1c500e939378cf68f60506b Mon Sep 17 00:00:00 2001
From: Hanmac <hanmac@cardforge.org>
Date: Tue, 11 Oct 2016 16:46:10 +0000
Subject: [PATCH] PhaseHandler: reset ActiveTriggers before the BattleTriggers
 are check. That does fix Finest Hour

---
 forge-game/src/main/java/forge/game/phase/PhaseHandler.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 e42c371233d..4626c13027d 100644
--- a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
+++ b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
@@ -513,6 +513,8 @@ public class PhaseHandler implements java.io.Serializable {
         }
 
         nCombatsThisTurn++;
+        // Reset all active Triggers
+        game.getTriggerHandler().resetActiveTriggers();
 
         // Prepare and fire event 'attackers declared'
         Multimap<GameEntity, Card> attackersMap = ArrayListMultimap.create();
@@ -855,7 +857,7 @@ public class PhaseHandler implements java.io.Serializable {
     }
 
     public final boolean isFirstCombat() {
-        return (nCombatsThisTurn == 0);
+        return (nCombatsThisTurn == 1);
     }
 
     public final boolean isFirstUpkeep() {