diff --git a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java index 3194d055666..83c512932ee 100644 --- a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java +++ b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java @@ -158,10 +158,10 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView { public void run() { playerPanels.get(0).initialize(FPref.CONSTRUCTED_P1_DECK_STATE, FPref.COMMANDER_P1_DECK_STATE, FPref.TINY_LEADER_P1_DECK_STATE, FPref.BRAWL_P1_DECK_STATE, DeckType.PRECONSTRUCTED_DECK); playerPanels.get(1).initialize(FPref.CONSTRUCTED_P2_DECK_STATE, FPref.COMMANDER_P2_DECK_STATE, FPref.TINY_LEADER_P2_DECK_STATE, FPref.BRAWL_P2_DECK_STATE, DeckType.COLOR_DECK); - if(getNumPlayers()>2) { + if (getNumPlayers() > 2) { playerPanels.get(2).initialize(FPref.CONSTRUCTED_P3_DECK_STATE, FPref.COMMANDER_P3_DECK_STATE, FPref.TINY_LEADER_P3_DECK_STATE, FPref.BRAWL_P3_DECK_STATE, DeckType.COLOR_DECK); } - if(getNumPlayers()>3) { + if (getNumPlayers() > 3) { playerPanels.get(3).initialize(FPref.CONSTRUCTED_P4_DECK_STATE, FPref.COMMANDER_P4_DECK_STATE, FPref.TINY_LEADER_P4_DECK_STATE, FPref.BRAWL_P4_DECK_STATE, DeckType.COLOR_DECK); } /*playerPanels.get(4).initialize(FPref.CONSTRUCTED_P5_DECK_STATE, DeckType.COLOR_DECK); @@ -193,7 +193,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView { btnStart.setEnabled(hasControl); lblVariants.setEnabled(hasControl); cbVariants.setEnabled(hasControl); - while(lobby.getNumberOfSlots()2){ - forMultiPlayer=true; + if(playerCount > 2){ + forMultiPlayer = true; avatarHeight *= 0.5f; //displayAreaHeightFactor *= 0.7f; } @@ -473,7 +473,7 @@ public class VPlayerPanel extends FContainer { else { g.startClip(-1, y, w + 2, yAcross - y); } - if(forMultiPlayer) { + if (forMultiPlayer) { g.drawLine(1, MatchScreen.BORDER_COLOR, 0, yAcross, w, yAcross); g.drawLine(1, MatchScreen.BORDER_COLOR, 0, y, 0, h); g.drawLine(1, MatchScreen.BORDER_COLOR, w, y, w, h); diff --git a/forge-gui/src/main/java/forge/match/AbstractGuiGame.java b/forge-gui/src/main/java/forge/match/AbstractGuiGame.java index 027b521fd78..95b7e944787 100644 --- a/forge-gui/src/main/java/forge/match/AbstractGuiGame.java +++ b/forge-gui/src/main/java/forge/match/AbstractGuiGame.java @@ -238,8 +238,8 @@ public abstract class AbstractGuiGame implements IGuiGame, IMayViewCards { // Don't immediately close, wait for win/lose screen return false; } else { - for(PlayerView player: getLocalPlayers()){ - if(!player.isAI()){ + for (PlayerView player : getLocalPlayers()){ + if (!player.isAI()){ getGameController(player).nextGameDecision(NextGameDecision.QUIT); } }