From a7c3f30ca704ff403259b0e594ff9f2c733b99c0 Mon Sep 17 00:00:00 2001
From: Paul2708 <paul.hoger@gmx.net>
Date: Sat, 5 Dec 2020 19:38:31 +0100
Subject: [PATCH] Hopefully solves #16

---
 .../server/src/main/java/de/paul2708/server/user/User.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/backend/server/src/main/java/de/paul2708/server/user/User.java b/backend/server/src/main/java/de/paul2708/server/user/User.java
index 72aba88..cca7436 100644
--- a/backend/server/src/main/java/de/paul2708/server/user/User.java
+++ b/backend/server/src/main/java/de/paul2708/server/user/User.java
@@ -30,6 +30,10 @@ public void send(Object data) {
     }
 
     public boolean hasSameSocket(WsContext context) {
+        if (context == null || socket == null) {
+            return false;
+        }
+
         return socket.getSessionId().equals(context.getSessionId());
     }
 
@@ -56,4 +60,4 @@ public UserRole getRole() {
     public WsContext getSocket() {
         return socket;
     }
-}
+}
\ No newline at end of file