fix: NullReferenceException destroying objects (#526)

These are giving NullReferenceException, they should not be necesary because unityevents automatically removes subscribers when they are destroyed.
MirageNet · Jan 9, 2021 · 3ad2608 · 3ad2608
1 parent 328637b
commit 3ad2608
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 17 deletions.
diff --git a/Assets/Mirror/Runtime/ClientObjectManager.cs b/Assets/Mirror/Runtime/ClientObjectManager.cs
@@ -99,15 +99,6 @@ internal void RegisterMessageHandlers()
             client.Connection.RegisterHandler<RpcMessage>(OnRpcMessage);
         }
 
-        void OnDestroy()
-        {
-            client.Connected.RemoveListener(OnClientConnected);
-            client.Disconnected.RemoveListener(OnClientDisconnected);
-
-            if (networkSceneManager != null)
-                networkSceneManager.ClientSceneChanged.RemoveListener(OnClientSceneChanged);
-        }
-
         static bool ConsiderForSpawning(NetworkIdentity identity)
         {
             // not spawned yet, not hidden, etc.?

diff --git a/Assets/Mirror/Runtime/ServerObjectManager.cs b/Assets/Mirror/Runtime/ServerObjectManager.cs
@@ -70,14 +70,6 @@ internal void RegisterMessageHandlers(INetworkConnection connection)
             connection.RegisterHandler<ServerRpcMessage>(OnServerRpcMessage);
         }
 
-        void OnDestroy()
-        {
-            server.Started.RemoveListener(SpawnOrActivate);
-            server.Authenticated.RemoveListener(OnAuthenticated);
-            networkSceneManager.ServerChangeScene.RemoveListener(OnServerChangeScene);
-            networkSceneManager.ServerSceneChanged.RemoveListener(OnServerSceneChanged);
-        }
-
         void OnAuthenticated(INetworkConnection connection)
         {
             RegisterMessageHandlers(connection);