From a19902f8190df79f7d830b744909b47cb191c86f Mon Sep 17 00:00:00 2001 From: Daniel Grigencha Date: Mon, 2 Dec 2024 00:28:59 +0100 Subject: [PATCH] Updated 'LobbyState' class. Updated the 'LobbyState' class by changing the method call 'isActive' to 'isReady'. --- .../src/main/java/pp/mdga/server/automaton/LobbyState.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java index 90993f63..ab4e74af 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java @@ -55,8 +55,8 @@ public void received(JoinedLobbyMessage msg, int from) { Player player = new Player(msg.getName()); player.setColor(Color.getColorByIndex(this.logic.getGame().getPlayers().size())); this.logic.getGame().addPlayer(from, player); - for (Map.Entry entry: this.logic.getGame().getPlayers().entrySet()) { - // this.logic.getServerSender().broadcast(new LobbyPlayerJoinedMessage(entry.getKey(), entry.getValue())); + for (Map.Entry entry : this.logic.getGame().getPlayers().entrySet()) { + this.logic.getServerSender().broadcast(new LobbyPlayerJoinedMessage(entry.getKey(), entry.getValue(), entry.getKey() == this.logic.getGame().getHost())); } } @@ -103,7 +103,7 @@ public void received(LobbyReadyMessage msg, int from) { this.logic.getGame().getPlayerById(from).setReady(true); this.logic.getServerSender().broadcast(new UpdateReadyMessage(from, true)); for (Map.Entry entry : this.logic.getGame().getPlayers().entrySet()) { - if (!entry.getValue().isActive()) { + if (!entry.getValue().isReady()) { return; } }