Updated 'LobbyState' class.
Updated the 'LobbyState' class by updating the 'JoinedLobbyMessage' and 'LobbyReadyMessage' handlings in it.
This commit is contained in:
		@@ -67,7 +67,7 @@ public void received(JoinedLobbyMessage msg, int from) {
 | 
			
		||||
        for (Map.Entry<Integer, Player> entry : this.logic.getGame().getPlayers().entrySet()) {
 | 
			
		||||
            this.logic.getServerSender().broadcast(new LobbyPlayerJoinedMessage(entry.getKey(), entry.getValue(), entry.getKey() == this.logic.getGame().getHost()));
 | 
			
		||||
 | 
			
		||||
            if(entry.getKey() != from) {
 | 
			
		||||
            if (entry.getKey() != from && entry.getValue().isReady()) {
 | 
			
		||||
                this.logic.getServerSender().send(from, new UpdateReadyMessage(entry.getKey(), entry.getValue().isReady()));
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
@@ -86,7 +86,8 @@ public void received(SelectTSKMessage msg, int from) {
 | 
			
		||||
            this.logic.getServerSender().broadcast(new UpdateTSKMessage(from, Color.NONE, false));
 | 
			
		||||
            this.logic.getGame().getPlayerById(from).setColor(msg.getColor());
 | 
			
		||||
            this.logic.getServerSender().broadcast(new UpdateTSKMessage(from, msg.getColor(), true));
 | 
			
		||||
        } else {
 | 
			
		||||
        }
 | 
			
		||||
        else {
 | 
			
		||||
            this.logic.getServerSender().send(from, new IncorrectRequestMessage(0));
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
@@ -116,10 +117,11 @@ public void received(LobbyReadyMessage msg, int from) {
 | 
			
		||||
        if (this.logic.getGame().getPlayerById(from).getColor() == Color.NONE) {
 | 
			
		||||
            Color color = this.logic.getGame().getFirstUnusedColor();
 | 
			
		||||
 | 
			
		||||
            if (color != null) {
 | 
			
		||||
            if (color != Color.NONE) {
 | 
			
		||||
                this.logic.getGame().getPlayerById(from).setColor(color);
 | 
			
		||||
                this.logic.getServerSender().broadcast(new UpdateTSKMessage(from, color, true));
 | 
			
		||||
            } else {
 | 
			
		||||
            }
 | 
			
		||||
            else {
 | 
			
		||||
                this.logic.getServerSender().send(from, new IncorrectRequestMessage(1));
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
@@ -153,7 +155,8 @@ public void received(StartGameMessage msg, int from) {
 | 
			
		||||
            this.initializeGame();
 | 
			
		||||
            this.logic.getServerSender().broadcast(new ServerStartGameMessage(this.logic.getGame().getPlayersAsList(), this.logic.getGame().getBoard()));
 | 
			
		||||
            this.logic.setCurrentState(this.logic.getGameState());
 | 
			
		||||
        } else {
 | 
			
		||||
        }
 | 
			
		||||
        else {
 | 
			
		||||
            this.logic.getServerSender().send(from, new IncorrectRequestMessage(5));
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user