From 6d1b4671160c09dd80eaf2d0e441ad214d61113e Mon Sep 17 00:00:00 2001
From: Jona Walpert <jona.walpert@stud.unibas.ch>
Date: Wed, 15 Apr 2026 21:06:13 +0200
Subject: [PATCH] Fix: Sent chat messages with current username at send time

---
 .../dbis/cs108/casono/client/ui/chatui/ChatViewController.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java
index 397e8f3..2bad460 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/client/ui/chatui/ChatViewController.java
@@ -68,11 +68,12 @@ public class ChatViewController implements Initializable {
         String message = inputField.getText().trim();
         if (!message.isEmpty()) {
             inputField.clear();
+            String currentUsername = controller.getCurrentUsername();
             Message msg =
                     new Message(
                             chatModel.getChattype(),
                             chatModel.lobbyId,
-                            username,
+                            currentUsername,
                             chatModel.getTarget(),
                             message);
             controller.onSendToNetwork(msg);