seb/NightTrainToBudapest
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjusted game logic to lobbies, now a game is started inside a lobby and only sends msg to clients in the respective lobby

Browse Source 
TODO:
when a client leaves a lobby or the server, the corresponding passenger needs to be transformed into an npc
This commit is contained in:
Seraina
2022-04-14 11:59:28 +02:00
parent 682b2634fc
commit 33d9ea899e
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java
View File

@@ -190,9 +190,12 @@ public class ClientHandler implements Runnable {
*
* @param msg the Message to be broadcast
*/
public void broadcastNpcChatMessage(String msg) {
for (ClientHandler client : connectedClients) {
client.sendMsgToClient(Protocol.printToClientConsole + "$" + msg);
public void broadcastNpcChatMessageToLobby(String msg) {
Lobby l = getLobby();
if (l != null) {
for (ClientHandler client : l.getLobbyClients()) {
client.sendMsgToClient(Protocol.printToClientChat + "$" + msg);
}
}
}
@@ -267,7 +270,7 @@ public class ClientHandler implements Runnable {
out.flush();
} catch (IOException e) {
//e.printStackTrace();
LOGGER.debug("unable to send msg: " + msg);
LOGGER.warn("unable to send msg: " + msg);
removeClientOnConnectionLoss();
}
}
@@ -302,7 +305,8 @@ public class ClientHandler implements Runnable {
*/
public void startNewGame() {
try {
Game game = new Game(this,6,1, ClientHandler.getConnectedClients().size());
Lobby l = getLobby();
Game game = new Game(6,1, l.getLobbyClients().size(), l);
Thread t = new Thread(game);
t.start();
} catch (TrainOverflow e) {