src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/network/LobbyClient.java

@@ -127,6 +127,15 @@ public class LobbyClient {
         client.processCommand("JOIN_LOBBY ID=" + lobbyId);
     }
 
+    /**
+     * Request the server to mark the current user as absent from the given lobby.
+     *
+     * @param lobbyId the lobby to leave
+     */
+    public void leaveLobby(int lobbyId) {
+        client.processCommand("LEAVE_LOBBY ID=" + lobbyId);
+    }
+
     /**
      * Logs in to the server with the given username by sending a "LOGIN" command.
      *

src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/CasinoGameController.java

@@ -405,7 +405,8 @@ public class CasinoGameController {
     // new Card("king", "spades"),
     // new Card("10", "diamonds")));
     //
-    //         renderPlayerCards(List.of(new Card("10", "spades"), new Card("king", "spades")));
+    // renderPlayerCards(List.of(new Card("10", "spades"), new Card("king",
+    // "spades")));
     // } catch (Exception e) {
     // e.printStackTrace();
     // }
@@ -2156,6 +2157,9 @@ public class CasinoGameController {
         if (controller == null) {
             return;
         }
+        if (chatClientService != null && chatLobbyId >= 0) {
+            controller.setLobbyContext(new LobbyClient(chatClientService), chatLobbyId);
+        }
         controller.setLobbyActionAnnouncer(this::sendLobbyActionMessage);
     }
 

src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/gameui/gameuicomponents/TaskbarController.java

@@ -52,6 +52,8 @@ public class TaskbarController {
     @FXML private Label moneyLabel;
 
     private GameService gameService;
+    private LobbyClient lobbyClient;
+    private int lobbyId = -1;
     private PlayerId myPlayerId;
     private String myPlayerName;
     private GameState lastState;
@@ -242,6 +244,12 @@ public class TaskbarController {
         this.myPlayerName = myPlayerId != null ? normalizeIdentifier(myPlayerId.value()) : null;
     }
 
+    /** Sets the lobby context so Exit can notify the server before closing. */
+    public void setLobbyContext(LobbyClient lobbyClient, int lobbyId) {
+        this.lobbyClient = lobbyClient;
+        this.lobbyId = lobbyId;
+    }
+
     /** Sets the NotebookController reference for showing/hiding tips. */
     public void setNotebookController(NotebookController notebookController) {
         this.notebookController = notebookController;
@@ -1622,6 +1630,16 @@ public class TaskbarController {
         SoundManager.getInstance().playButtonClick();
         javafx.application.Platform.runLater(
                 () -> {
+                    if (lobbyClient != null && lobbyId > 0) {
+                        try {
+                            lobbyClient.leaveLobby(lobbyId);
+                        } catch (RuntimeException e) {
+                            LOGGER.warn(
+                                    "Could not notify server about lobby leave: {}",
+                                    e.getMessage());
+                        }
+                    }
+
                     // Close game stage
                     javafx.stage.Stage currentStage =
                             (javafx.stage.Stage) taskbar.getScene().getWindow();