From 519e6ec64fd798a7b50fb1f16bc029bd754f956b Mon Sep 17 00:00:00 2001
From: eb093 <eb093@hdm-stuttgart.de>
Date: Mon, 4 Dec 2023 18:54:28 +0100
Subject: [PATCH] Update: fixed x and y cord as array send to server and update
of x and y.
---
.../Model/Multiplayer/ConnectionHandler.java | 13 ++++++++-----
.../battlearena/Model/Multiplayer/Server.java | 8 ++++----
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/ConnectionHandler.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/ConnectionHandler.java
index 847ca999..67529ff1 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/ConnectionHandler.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/ConnectionHandler.java
@@ -9,13 +9,12 @@ import java.util.concurrent.TimeUnit;
public class ConnectionHandler {
- private int pX;
- private int pY;
+ private static int pX = 0;
+ private static int pY = 0;
private int enemyX;
private int enemyY;
private static int playerID = 0;
- private static int[] coordinates = {5,10,playerID};
-
+ private static int[] coordinates = {pX,pY,playerID};
private static final Logger log = LogManager.getLogger(ConnectionHandler.class);
@@ -28,13 +27,17 @@ public class ConnectionHandler {
System.out.println("Enemy X: " + cords[0]);
System.out.println("Enemy Y: " + cords[1]);
System.out.println("Your PlayerID is " + cords[2]);
+ pX++;
+ pY++;
playerID = cords[2];
+ //Assign the Values to the message to send:
+ coordinates[0] = pX;
+ coordinates[1] = pY;
coordinates[2] = playerID;
TimeUnit.SECONDS.sleep(1);
}
-
//stop the connection:
//client.stopConnection();
}
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/Server.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/Server.java
index 9069f0e1..e9226a37 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/Server.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/Server.java
@@ -20,7 +20,6 @@ public class Server {
private static int enemyx = 0;
private static int enemyy = 0;
-
private static int playerID;
private static int playercount = 0;
private static int[] cords;
@@ -36,7 +35,9 @@ public class Server {
public void start(String localhost, int port) throws IOException {
serverSocket = new ServerSocket(port);
log.info("server started!");
- new ServerHandler(serverSocket.accept()).start();
+ while (true){
+ new ServerHandler(serverSocket.accept()).start();
+ }
}
private static class ServerHandler extends Thread {
@@ -58,7 +59,6 @@ public class Server {
String inputLine = localIn.readLine();
-
if (inputLine != null) {
// Assuming that the input line is a comma-separated list of integers
String[] coordinates = inputLine.split(",");
@@ -114,7 +114,7 @@ public class Server {
localOut.flush();
}
- log.info("Player X: " + px + " Player Y: " + py);
+ log.info("Player X / Y : " + px + " / " + py + " Enemy X / Y : " + enemyx + " / " + enemyy);
//check if server was shut down:
--
GitLab