From 92c86cf15b3f086d0c6468415571a357dd8c1170 Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Tue, 5 Jan 2021 23:28:31 -0500
Subject: [PATCH] Null check tick thread (#1812)

---
 .../org/geysermc/connector/network/session/GeyserSession.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
index 5a0d5eeb1..1a51bf970 100644
--- a/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
+++ b/connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
@@ -595,7 +595,9 @@ public class GeyserSession implements CommandSender {
             }
         }
 
-        tickThread.cancel(true);
+        if (tickThread != null) {
+            tickThread.cancel(true);
+        }
 
         this.chunkCache = null;
         this.entityCache = null;