Fixed Client cleaup on Disconnect

Author: TwoTenPvP

MLAPI/Data/FixedQueue.cs

@@ -17,6 +17,14 @@ public sealed class FixedQueue<T>
         /// </summary>
         public int Count { get => queueCount; }
 
+        public T this[int index]
+        {
+            get
+            {
+                return queue[(queueStart + index) % queue.Length];
+            }
+        }
+
         /// <summary>
         /// Creates a new FixedQueue with a given size
         /// </summary>

MLAPI/Data/NetworkProfiler/NetworkProfiler.cs

@@ -1,4 +1,5 @@
-using MLAPI.NetworkingManagerComponents.Core;
+using System.Collections.Generic;
+using MLAPI.NetworkingManagerComponents.Core;
 using UnityEngine;
 
 namespace MLAPI.Data.NetworkProfiler
@@ -29,18 +30,39 @@ public static void Start(int historyLength)
             isRunning = true;
         }
 
-        public static ProfilerTick[] Stop()
+        public static void Stop()
+        {
+            Ticks = null; //leave to GC
+            CurrentTick = null; //leave to GC
+            isRunning = false;
+        }
+
+        public static int Stop(ref ProfilerTick[] tickBuffer)
         {
             if (!isRunning)
-                return new ProfilerTick[0];
-            ProfilerTick[] ticks = new ProfilerTick[Ticks.Count];
-            for (int i = 0; i < Ticks.Count; i++)
-                ticks[i] = Ticks.ElementAt(i);
-            
+                return 0;
+            int iteration = Ticks.Count > tickBuffer.Length ? tickBuffer.Length : Ticks.Count;
+            for (int i = 0; i < iteration; i++) tickBuffer[i] = Ticks[i];
+
+            Ticks = null; //leave to GC
+            CurrentTick = null; //leave to GC
+            isRunning = false;
+
+            return iteration;
+        }
+
+        public static int Stop(ref List<ProfilerTick> tickBuffer)
+        {
+            if (!isRunning)
+                return 0;
+            int iteration = Ticks.Count > tickBuffer.Count ? tickBuffer.Count : Ticks.Count;
+            for (int i = 0; i < iteration; i++) tickBuffer[i] = Ticks[i];
+
             Ticks = null; //leave to GC
             CurrentTick = null; //leave to GC
             isRunning = false;
-            return ticks;
+
+            return iteration; 
         }
 
         internal static void StartTick(TickType type)

MLAPI/MonoBehaviours/Core/NetworkingManager.cs

@@ -592,6 +592,7 @@ public void StopClient()
             if (LogHelper.CurrentLogLevel <= LogLevel.Developer) LogHelper.LogInfo("StopClient()");
             _isClient = false;
             NetworkConfig.NetworkTransport.DisconnectFromServer();
+            _isClientConnected = false;
             Shutdown();
         }
 
@@ -661,6 +662,7 @@ private void OnDestroy()
         private void Shutdown()
         {
             if (LogHelper.CurrentLogLevel <= LogLevel.Developer) LogHelper.LogInfo("Shutdown()");
+            NetworkProfiler.Stop();
             isListening = false;
             _isClient = false;
             _isServer = false;
@@ -751,9 +753,12 @@ private void Update()
                                 if (LogHelper.CurrentLogLevel <= LogLevel.Developer) LogHelper.LogInfo("Disconnect Event From " + clientId);
 
                                 if (isServer)
-                                    OnClientDisconnect(clientId);
+                                    OnClientDisconnectFromServer(clientId);
                                 else
+                                {
                                     _isClientConnected = false;
+                                    StopClient();
+                                }
 
                                 if (OnClientDisconnectCallback != null)
                                     OnClientDisconnectCallback.Invoke(clientId);
@@ -1061,7 +1066,7 @@ internal void DisconnectClient(uint clientId)
             NetworkConfig.NetworkTransport.DisconnectClient(clientId);
         }
 
-        internal void OnClientDisconnect(uint clientId)
+        internal void OnClientDisconnectFromServer(uint clientId)
         {
             if (pendingClients.Contains(clientId))
                 pendingClients.Remove(clientId);
@@ -1434,7 +1439,7 @@ public void SendToClient(uint clientId, string messageType, string channelName,
         /// <typeparam name="T">The class type to send</typeparam>
         /// <param name="clientId">The clientId to send the message to</param>
         /// <param name="messageType">User defined messageType</param>
-        /// <param name="channelName">User defined channelName</param>	
+        /// <param name="channelName">User defined channelName</param>    
         /// <param name="instance">The instance to send</param>
         public void SendToClient<T>(int clientId, string messageType, string channelName, T instance)
         {
@@ -1505,7 +1510,7 @@ public void SendToClients(uint[] clientIds, string messageType, string channelNa
         /// <typeparam name="T">The class type to send</typeparam>
         /// <param name="clientIds">The clientId's to send to</param>
         /// <param name="messageType">User defined messageType</param>
-        /// <param name="channelName">User defined channelName</param>	
+        /// <param name="channelName">User defined channelName</param>    
         /// <param name="instance">The instance to send</param>
         public void SendToClients<T>(int[] clientIds, string messageType, string channelName, T instance)
         {
@@ -1576,7 +1581,7 @@ public void SendToClients(List<uint> clientIds, string messageType, string chann
         /// <typeparam name="T">The class type to send</typeparam>
         /// <param name="clientIds">The clientId's to send to</param>
         /// <param name="messageType">User defined messageType</param>
-        /// <param name="channelName">User defined channelName</param>	
+        /// <param name="channelName">User defined channelName</param>    
         /// <param name="instance">The instance to send</param>
         public void SendToClients<T>(List<int> clientIds, string messageType, string channelName, T instance)
         {
@@ -1644,7 +1649,7 @@ public void SendToClients(string messageType, string channelName, BitWriter writ
         /// </summary>
         /// <typeparam name="T">The class type to send</typeparam>
         /// <param name="messageType">User defined messageType</param>
-        /// <param name="channelName">User defined channelName</param>	
+        /// <param name="channelName">User defined channelName</param>    
         /// <param name="instance">The instance to send</param>
         public void SendToClients<T>(string messageType, string channelName, T instance)
         {

MLAPI/NetworkingManagerComponents/Core/InternalMessageHandler.Receive.cs

@@ -177,7 +177,7 @@ internal static void HandleAddObject(uint clientId, BitReader reader, int channe
         internal static void HandleClientDisconnect(uint clientId, BitReader reader, int channelId)
         {
             uint disconnectedClientId = reader.ReadUInt();
-            netManager.OnClientDisconnect(disconnectedClientId);
+            netManager.OnClientDisconnectFromServer(disconnectedClientId);
         }
 
         internal static void HandleDestroyObject(uint clientId, BitReader reader, int channelId)