diff --git a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java index e4eb39c6532..5885874ed5f 100644 --- a/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java +++ b/forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java @@ -111,6 +111,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView { add(lblVariants); cbVariants = add(new FComboBox()); + cbVariants.setEnabled(lobby.hasControl()); cbVariants.setFont(VARIANTS_FONT); cbVariants.addItem("(None)"); cbVariants.addItem(GameType.Vanguard); @@ -160,7 +161,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView { FThreads.invokeInEdtLater(new Runnable() { @Override public void run() { - btnStart.setEnabled(true); + btnStart.setEnabled(lobby.hasControl()); } }); } @@ -177,7 +178,12 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView { protected void initLobby(GameLobby lobby0) { lobby = lobby0; lobby.setListener(this); - btnStart.setVisible(lobby.hasControl()); + + boolean hasControl = lobby.hasControl(); + btnStart.setEnabled(hasControl); + if (cbVariants != null) { + cbVariants.setEnabled(hasControl); + } } private void updateVariantSelection() { diff --git a/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java b/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java index c2cb233b40d..98555bc85f8 100644 --- a/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java +++ b/forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java @@ -604,6 +604,7 @@ public class PlayerPanel extends FContainer { return isReady; } public void setIsReady(boolean isReady0) { + if (isReady == isReady0) { return; } isReady = isReady0; humanAiSwitch.setToggled(isReady); } diff --git a/forge-gui/src/main/java/forge/net/server/ServerGameLobby.java b/forge-gui/src/main/java/forge/net/server/ServerGameLobby.java index ef39d19f094..a300c052b44 100644 --- a/forge-gui/src/main/java/forge/net/server/ServerGameLobby.java +++ b/forge-gui/src/main/java/forge/net/server/ServerGameLobby.java @@ -39,6 +39,7 @@ public final class ServerGameLobby extends GameLobby { final LobbySlot slot = getSlot(index); slot.setType(LobbySlotType.OPEN); slot.setName(StringUtils.EMPTY); + slot.setIsReady(false); updateView(false); }