From 7df66392568ca87a14e4b4afa9a0418bff722481 Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Fri, 19 Mar 2021 02:01:02 -0700
Subject: [PATCH] fix(core): Fixes netstate dropping late (#556)

---
 Projects/Server/Network/NetState/NetState.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Projects/Server/Network/NetState/NetState.cs b/Projects/Server/Network/NetState/NetState.cs
index 152617e9c..331212c66 100644
--- a/Projects/Server/Network/NetState/NetState.cs
+++ b/Projects/Server/Network/NetState/NetState.cs
@@ -1056,6 +1056,13 @@ namespace Server.Network
                 return;
             }
 
+            var m = Mobile;
+            if (m != null)
+            {
+                m.NetState = null;
+                Mobile = null;
+            }
+
             try
             {
                 if (_disconnectReason != string.Empty)
@@ -1104,15 +1111,8 @@ namespace Server.Network
             RecvPipe.Writer.Close();
             SendPipe.Writer.Close();
 
-            var m = Mobile;
             var a = Account;
 
-            if (m != null)
-            {
-                m.NetState = null;
-                Mobile = null;
-            }
-
             Gumps.Clear();
             Menus.Clear();
             HuePickers.Clear();