temp

Assets/Mirror/Runtime/NetworkClient.cs

@@ -194,7 +194,7 @@ internal static void OnDataReceived(ArraySegment<byte> data, int channelId)
         /// <summary>
         /// Handles OnClientConnected from transport
         /// </summary>
-        static void OnConnectedInternal()
+        internal static void OnConnectedInternal()
         {
             if (connection != null)
             {
@@ -393,7 +393,11 @@ public static void Shutdown()
             // we do NOT call Transport.Shutdown, because someone only called
             // NetworkClient.Shutdown. we can't assume that the server is
             // supposed to be shut down too!
-            Transport.activeTransport.ClientDisconnect();
+            Transport.activeTransport?.ClientDisconnect();
+
+            // clear event listeners
+            OnConnected = null;
+            OnDisconnected = null;
         }
     }
 }

Assets/Mirror/Runtime/NetworkServer.cs

@@ -108,6 +108,9 @@ public static void Shutdown()
 
             CleanupNetworkIdentities();
             NetworkIdentity.ResetNextNetworkId();
+
+            OnConnected = null;
+            OnDisconnected = null;
         }
 
         static void CleanupNetworkIdentities()
@@ -437,7 +440,7 @@ public static void DisconnectAllConnections()
                 conn.Disconnect();
                 // call OnDisconnected unless local player in host mode
                 if (conn.connectionId != NetworkConnection.LocalConnectionId)
-                    OnDisconnected(conn);
+                    OnDisconnectedInternal(conn);
             }
             connections.Clear();
         }
@@ -534,7 +537,7 @@ static void OnConnectedInternal(int connectionId)
             {
                 // add connection
                 NetworkConnectionToClient conn = new NetworkConnectionToClient(connectionId);
-                OnConnected(conn);
+                OnConnectedInternal(conn);
             }
             else
             {

Assets/Mirror/Tests/Common/MemoryTransport.cs

@@ -124,20 +124,12 @@ public override void ServerSend(int connectionId, int channelId, ArraySegment<by
 
         public override bool ServerDisconnect(int connectionId)
         {
-            // clear all pending messages that we may have received.
-            // over the wire, we wouldn't receive any more pending messages
-            // ether after calling disconnect.
-            serverIncoming.Clear();
-
             // add client disconnected message with connectionId
             clientIncoming.Enqueue(new Message(connectionId, EventType.Disconnected, null));
 
             // add server disconnected message with connectionId
             serverIncoming.Enqueue(new Message(connectionId, EventType.Disconnected, null));
 
-            // not active anymore
-            serverActive = false;
-
             return false;
         }
 

Assets/Mirror/Tests/Editor/NetworkClientTests.cs

@@ -89,5 +89,42 @@ public void Send()
             // received it on server?
             Assert.That(called, Is.EqualTo(1));
         }
+
+        [Test]
+        public void ShutdownClearsEvents()
+        {
+            int called = 0;
+            NetworkClient.OnConnected += (c) => { called++; };
+
+            NetworkClient.Connect("localhost");
+            ((MemoryTransport)Transport.activeTransport).LateUpdate();
+
+            Assert.That(called, Is.EqualTo(1));
+
+            // remove events
+            NetworkClient.Disconnect();
+            NetworkClient.Shutdown();
+
+            NetworkClient.Connect("localhost");
+            ((MemoryTransport)Transport.activeTransport).LateUpdate();
+
+            Assert.That(called, Is.EqualTo(1), "Call count should still be 1");
+
+            // reset
+            NetworkClient.Disconnect();
+            NetworkClient.Shutdown();
+
+
+            // add event again
+            NetworkClient.OnConnected += (c) =>
+            {
+                called++;
+            };
+
+            NetworkClient.Connect("localhost");
+            ((MemoryTransport)Transport.activeTransport).LateUpdate();
+
+            Assert.That(called, Is.EqualTo(2), "Call count should now be 2");
+        }
     }
 }