From 92be52b62a094986f58142b0fa4731d8df6385a7 Mon Sep 17 00:00:00 2001
From: Fleischer Hanno <hanno.fleischer@unibw.de>
Date: Sun, 1 Dec 2024 22:33:30 +0100
Subject: [PATCH] fixed server join logic

---
 .../src/main/java/pp/mdga/client/server/MdgaServer.java    | 4 +---
 .../client/src/main/java/pp/mdga/client/view/MainView.java | 7 ++++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/server/MdgaServer.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/server/MdgaServer.java
index 3522d1e7..8a952a12 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/server/MdgaServer.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/server/MdgaServer.java
@@ -68,9 +68,7 @@ public void run() {
     private void startServer() {
         try {
             LOGGER.log(Level.INFO, "Starting server..."); //NON-NLS
-            InetAddress localhost;
-            localhost = InetAddress.getLocalHost();
-            String ip = localhost.getHostAddress();
+
             myServer = Network.createServer(port);
             initializeSerializables();
             myServer.start();
diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/MainView.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/MainView.java
index dc5076b5..68416fa3 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/view/MainView.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/view/MainView.java
@@ -126,7 +126,7 @@ private void tryHost() {
     private void tryJoin() {
         int port = 0;
         String ip = joinDialog.getIpt();
-        String portText = hostDialog.getPort();
+        String portText = joinDialog.getPort();
 
         try {
             // Validate the port
@@ -134,9 +134,10 @@ private void tryJoin() {
             if (port < 1 || port > 65535) {
                 throw new IllegalArgumentException("Invalid port");
             }
-
+            joinDialog.setPortNumber(port);
             // Validate the IP address
             if (isValidIpAddress(ip)) {
+                joinDialog.setHostname(ip);
                 app.getModelSynchronize().setName(startDialog.getName());
                 app.getModelSynchronize().setJoin(ip, port);
                 joinDialog.connectToServer();
@@ -146,7 +147,7 @@ private void tryJoin() {
             // Invalid input, fall through to reset
         }
 
-        hostDialog.resetPort();
+        joinDialog.resetPort();
         joinDialog.resetIp();
         app.getAcousticHandler().playSound(MdgaSound.WRONG_INPUT);
     }