From d1674a2d744f2c62fc69f67011d0076efa5fc1dc Mon Sep 17 00:00:00 2001
From: ORelio <oreliogitantispam.l0gin@spamgourmet.com>
Date: Sun, 24 Nov 2019 12:49:03 +0100
Subject: [PATCH] Fix conflict between TimeoutDetector and AutoRelog

Disable TimeoutDetector as soon as a kick message is detected
See #817
---
 MinecraftClient/McTcpClient.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/MinecraftClient/McTcpClient.cs b/MinecraftClient/McTcpClient.cs
index 287e8d41..18c24efe 100644
--- a/MinecraftClient/McTcpClient.cs
+++ b/MinecraftClient/McTcpClient.cs
@@ -369,7 +369,10 @@ namespace MinecraftClient
                 cmdprompt.Abort();
 
             if (timeoutdetector != null)
+            {
                 timeoutdetector.Abort();
+                timeoutdetector = null;
+            }
 
             Thread.Sleep(1000);
 
@@ -724,6 +727,12 @@ namespace MinecraftClient
         {
             world.Clear();
 
+            if (timeoutdetector != null)
+            {
+                timeoutdetector.Abort();
+                timeoutdetector = null;
+            }
+
             bool will_restart = false;
 
             switch (reason)