From ccad9154641ea7fccc9bb5355521cf55a5ad4909 Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Mon, 27 May 2024 12:10:27 -0700
Subject: [PATCH] fix: Adds more NetState dumping for debug (#1795)

---
 .../Server/Network/NetState/DumpNetStates.cs  |  6 ++--
 Projects/Server/Network/NetState/NetState.cs  | 34 ++++---------------
 2 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/Projects/Server/Network/NetState/DumpNetStates.cs b/Projects/Server/Network/NetState/DumpNetStates.cs
index be3c2bdea..22746238e 100644
--- a/Projects/Server/Network/NetState/DumpNetStates.cs
+++ b/Projects/Server/Network/NetState/DumpNetStates.cs
@@ -26,13 +26,13 @@ public static class DumpNetStates
 
     public static void DumpNetStatesCommand(CommandEventArgs args)
     {
-        using var file = new StreamWriter("netstatedump.csv");
+        using var file = new StreamWriter($"netstatedump-{Core.Now:yyyy-M-d-HH-mm-ss}_{Core.TickCount}.csv");
 
-        file.WriteLine("NetState, RecvTask, SendTask, ProtocolState, ParserState");
+        file.WriteLine("NetState, ConnectedOn, NextActivityCheck, SocketConnected, ProtocolState, ParserState");
 
         foreach (var ns in NetState.Instances)
         {
-            file.WriteLine($"{ns}, {ns._protocolState}, {ns._parserState}");
+            file.WriteLine($"{ns}, {ns.ConnectedOn}, {ns.NextActivityCheck}, {ns.Connection.Connected}, {ns._protocolState}, {ns._parserState}");
         }
     }
 }
diff --git a/Projects/Server/Network/NetState/NetState.cs b/Projects/Server/Network/NetState/NetState.cs
index cdee40c20..e4ce75cf2 100755
--- a/Projects/Server/Network/NetState/NetState.cs
+++ b/Projects/Server/Network/NetState/NetState.cs
@@ -67,7 +67,6 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
 
     private readonly string _toString;
     private ClientVersion _version;
-    private long _nextActivityCheck;
     private bool _running = true;
     private volatile DecodePacket _packetDecoder;
     private volatile EncodePacket _packetEncoder;
@@ -133,7 +132,7 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
         Trades = [];
         RecvPipe = new Pipe(RecvPipeSize);
         SendPipe = new Pipe(SendPipeSize);
-        _nextActivityCheck = Core.TickCount + 30000;
+        NextActivityCheck = Core.TickCount + 30000;
         ConnectedOn = Core.Now;
 
         try
@@ -166,6 +165,8 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
     public NetState Previous { get; set; }
     public bool OnLinkList { get; set; }
 
+    public long NextActivityCheck { get; private set; }
+
     // Only use this for debugging. This will make your server very slow!
     public bool PacketLogging
     {
@@ -340,28 +341,7 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
         return null;
     }
 
-    public SecureTradeContainer FindTradeContainer(Mobile m)
-    {
-        for (var i = 0; i < Trades.Count; ++i)
-        {
-            var trade = Trades[i];
-
-            var from = trade.From;
-            var to = trade.To;
-
-            if (from.Mobile == Mobile && to.Mobile == m)
-            {
-                return from.Container;
-            }
-
-            if (from.Mobile == m && to.Mobile == Mobile)
-            {
-                return to.Container;
-            }
-        }
-
-        return null;
-    }
+    public SecureTradeContainer FindTradeContainer(Mobile m) => FindTrade(m)?.From.Container;
 
     public SecureTradeContainer AddTrade(NetState state)
     {
@@ -920,7 +900,7 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
 
         if (bytesWritten > 0)
         {
-            _nextActivityCheck = Core.TickCount + 90000;
+            NextActivityCheck = Core.TickCount + 90000;
             reader.Advance((uint)bytesWritten);
         }
 
@@ -972,7 +952,7 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
         DecodePacket(buffer, ref bytesWritten);
 
         writer.Advance((uint)bytesWritten);
-        _nextActivityCheck = Core.TickCount + 90000;
+        NextActivityCheck = Core.TickCount + 90000;
     }
 
     private static void DisconnectUnattachedSockets()
@@ -1084,7 +1064,7 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
 
     public void CheckAlive(long curTicks)
     {
-        if (Connection != null && _nextActivityCheck - curTicks < 0)
+        if (Connection != null && NextActivityCheck - curTicks < 0)
         {
             LogInfo("Disconnecting due to inactivity...");
             Disconnect("Disconnecting due to inactivity.");