From 4213e1269da6a800db0ff1a06ce2cb255ab5633b Mon Sep 17 00:00:00 2001 From: Agetian Date: Tue, 11 Oct 2016 16:30:17 +0000 Subject: [PATCH] - Looks like combat phases are counted from 0 up? (fixes Finest Hour and possibly other cards that trigger "at first combat phase"). --- forge-game/src/main/java/forge/game/phase/PhaseHandler.java | 2 +- 1 file changed, 1 insertion(+), 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 22b1a5a0200..e42c371233d 100644 --- a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java +++ b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java @@ -855,7 +855,7 @@ public class PhaseHandler implements java.io.Serializable { } public final boolean isFirstCombat() { - return (nCombatsThisTurn == 1); + return (nCombatsThisTurn == 0); } public final boolean isFirstUpkeep() {