From 42689cdc3b35152b3985aa2452dd304c79bf809f Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 12:38:19 +0000 Subject: [PATCH] - Fix for canCastSorcery() incorrectly returning true during Opponents 2nd main phase. --- src/forge/Phase.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/forge/Phase.java b/src/forge/Phase.java index de5ec77de4d..1b845eb7c76 100644 --- a/src/forge/Phase.java +++ b/src/forge/Phase.java @@ -598,8 +598,8 @@ public class Phase extends MyObservable public static boolean canCastSorcery(Player player) { - return ((AllZone.Phase.getPhase().equals(Constant.Phase.Main2) || (AllZone.Phase.getPhase().equals(Constant.Phase.Main1)) - && AllZone.Phase.isPlayerTurn(player)) && AllZone.Stack.size() == 0); + return AllZone.Phase.isPlayerTurn(player) && (AllZone.Phase.getPhase().equals(Constant.Phase.Main2) || + AllZone.Phase.getPhase().equals(Constant.Phase.Main1)) && AllZone.Stack.size() == 0; } public static boolean canPlayDuringCombat() {