- Fix for canCastSorcery() incorrectly returning true during Opponents 2nd main phase.

This commit is contained in:
jendave
2011-08-06 12:38:19 +00:00
parent 525ed7a45c
commit 42689cdc3b

View File

@@ -598,8 +598,8 @@ public class Phase extends MyObservable
public static boolean canCastSorcery(Player player) public static boolean canCastSorcery(Player player)
{ {
return ((AllZone.Phase.getPhase().equals(Constant.Phase.Main2) || (AllZone.Phase.getPhase().equals(Constant.Phase.Main1)) return AllZone.Phase.isPlayerTurn(player) && (AllZone.Phase.getPhase().equals(Constant.Phase.Main2) ||
&& AllZone.Phase.isPlayerTurn(player)) && AllZone.Stack.size() == 0); AllZone.Phase.getPhase().equals(Constant.Phase.Main1)) && AllZone.Stack.size() == 0;
} }
public static boolean canPlayDuringCombat() { public static boolean canPlayDuringCombat() {