From 63a8e21f6c8e713b53df17368a30e993cbae71d0 Mon Sep 17 00:00:00 2001
From: Jonas <jonas.biedermann@stud.unibas.ch>
Date: Sun, 27 Mar 2022 11:58:48 +0200
Subject: [PATCH] Ping(back) works on both client and server side.

---
 .../ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java    | 3 +--
 .../dbis/cs108/multiplayer/client/JClientProtocolParser.java   | 2 --
 .../dbis/cs108/multiplayer/server/JServerProtocolParser.java   | 2 --
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java
index 456be43..9a4e3cc 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java
@@ -142,10 +142,9 @@ public class Client {
       socket = new Socket(hostname, 42069);
       Client client = new Client(socket, username);
       client.chatListener();
-      client.sendMessage();
       Thread cP = new Thread(client.clientPinger);
-      System.out.println("im here");
       cP.start();
+      client.sendMessage();     //this one blocks.
     } catch (UnknownHostException e) {
       System.out.println("Invalid host IP");
     } catch (IOException e) {
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/JClientProtocolParser.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/JClientProtocolParser.java
index 76c6ad5..b8ac4ef 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/JClientProtocolParser.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/JClientProtocolParser.java
@@ -20,11 +20,9 @@ public class JClientProtocolParser {
     switch (header) {
       case "SPING":
         c.sendMsgToServer("PINGB");
-        System.out.println("got ping!");   //todo:delete
         break;
       case "PINGB":
         c.clientPinger.setGotPingBack(true);
-        System.out.println("got pingback!");    //todo: delete
         break;
       default:
         System.out.println("Received unknown command");
diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/JServerProtocolParser.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/JServerProtocolParser.java
index 83479fa..09e668d 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/JServerProtocolParser.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/JServerProtocolParser.java
@@ -24,11 +24,9 @@ public class JServerProtocolParser {
         break;
       case "CPING":
         h.sendMsgToClient("PINGB");
-        System.out.println("got ping!");   //todo:delete
         break;
       case "PINGB":
         h.serverPinger.setGotPingBack(true);
-        System.out.println("got pingback!");    //todo: delete
         break;
       case "QUITS":
         h.closeEverything(h.getSocket(), h.getIn(), h.getOut());