external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

- CheckStyle.

Browse Source
This commit is contained in:
Chris
2012-04-09 19:05:04 +00:00
parent f77c9cdde7
commit ed1915fba8
8 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/forge/game/phase/PhaseUtil.java
View File

@@ -372,7 +372,7 @@ public class PhaseUtil {
*/
public static boolean isBeforeAttackersAreDeclared() {
final PhaseType phase = Singletons.getModel().getGameState().getPhaseHandler().getPhase();
return phase == PhaseType.UNTAP || phase == PhaseType.UPKEEP || phase == PhaseType.DRAW
return phase == PhaseType.UNTAP || phase == PhaseType.UPKEEP || phase == PhaseType.DRAW
|| phase == PhaseType.MAIN1 || phase == PhaseType.COMBAT_BEGIN;
}
@@ -391,8 +391,8 @@ public class PhaseUtil {
// Index of field; computer is 0, human is 1
int i = p.isComputer() ? 0 : 1;
switch(s)
{
switch(s) {
case UPKEEP:
lbl = t.getFieldControls().get(i).getView().getLblUpkeep();
break;