From 2f79b41618979b556b7cdcd2f81c01f7a5575439 Mon Sep 17 00:00:00 2001
From: Seraina <seraina.schoeb@unibas.ch>
Date: Thu, 14 Apr 2022 15:05:00 +0200
Subject: [PATCH] Avoided null pointer exception by adding an if statement

---
 .../dmi/dbis/cs108/multiplayer/server/ClientHandler.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java
index d70f538..f2e0574 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java
@@ -461,8 +461,9 @@ public class ClientHandler implements Runnable {
    */
   public void disconnectClient() {
     Lobby l = getLobby();
-    Game g = l.getGame();
-    if (l != null && g != null) {
+    if (l != null) {
+      Game g = l.getGame();
+      if(g != null)
       l.getGame().getGameState().handleClientDisconnect(this);
     }
     socket = this.getSocket();