From d45d64a9c759f3afebcc03dfe2c8a4dc2669446c Mon Sep 17 00:00:00 2001
From: Seraina <seraina.schoeb@unibas.ch>
Date: Sat, 9 Apr 2022 11:52:20 +0200
Subject: [PATCH] Removed interruption from pinger

---
 .../multiplayer/helpers/ClientPinger.java     | 36 +++++++++----------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/ClientPinger.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/ClientPinger.java
index 52d0b11..d73b209 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/ClientPinger.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/ClientPinger.java
@@ -38,30 +38,26 @@ public class ClientPinger implements Runnable {
     Thread.currentThread().setPriority(10);
     try {
       Thread.sleep(20000);
-    } catch (InterruptedException e) {
-      Thread.currentThread().interrupt();
-    }
-    while (socket.isConnected() && !socket.isClosed()) {
-      gotPingBack = false;
-      client.sendMsgToServer(Protocol.pingFromClient);
-      try {
+      while (socket.isConnected() && !socket.isClosed()) {
+        gotPingBack = false;
+        client.sendMsgToServer(Protocol.pingFromClient);
         Thread.sleep(4000);
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-      }
-      if (gotPingBack) {
-        if (!isConnected) {         //if !isConnected, then the connection had been lost before.
-          isConnected = true;
-          System.out.println("Connection regained!");
-        }
-      } else {
-        if (isConnected) {
-          isConnected = false;
-          System.out.println("Lost connection. Waiting to reconnect...");
+        if (gotPingBack) {
+          if (!isConnected) {         //if !isConnected, then the connection had been lost before.
+            isConnected = true;
+            System.out.println("Connection regained!");
+          }
+        } else {
+          if (isConnected) {
+            isConnected = false;
+            System.out.println("Lost connection. Waiting to reconnect...");
+          }
         }
       }
+      isConnected = false;
+    } catch (InterruptedException e) {
+      e.printStackTrace();
     }
-    isConnected = false;
   }
 
   public void setGotPingBack(boolean gotPingBack) {