From c9e564370e0bcc8058e2d01bcfa41af0de282d4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Sun, 2 Mar 2025 12:37:25 +0100 Subject: [PATCH] Fixed bug allowing client to be in two different rooms at the same time --- ChatApp/src/server/Server.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ChatApp/src/server/Server.java b/ChatApp/src/server/Server.java index e030cf8..bb0544e 100644 --- a/ChatApp/src/server/Server.java +++ b/ChatApp/src/server/Server.java @@ -50,7 +50,8 @@ public class Server implements PacketHandler { return false; } rooms.put(roomName, new ArrayList<>()); - rooms.get(roomName).add(connexion); + leaveRoom(connexion); // Leave the current room (auto handle if not in a room) + rooms.get(roomName).add(connexion); // Add the creator to the room return true; } @@ -68,6 +69,7 @@ public class Server implements PacketHandler { } public boolean joinRoom(String roomName, ServerConnexion connexion) { + leaveRoom(connexion); // Leave the current room (auto handle if not in a room) if (rooms.containsKey(roomName) && !rooms.get(roomName).contains(connexion)) { rooms.get(roomName).add(connexion); return true;