fix: fixing NRE in log when handler is null

MirageNet · Apr 24, 2022 · 013b03c · 013b03c
1 parent c2b7afa
commit 013b03c
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/Assets/Mirage/Runtime/ClientObjectManager.cs b/Assets/Mirage/Runtime/ClientObjectManager.cs
@@ -296,8 +296,13 @@ public void UnregisterPrefab(NetworkIdentity identity)
         /// <param name="unspawnHandler">A method to use as a custom un-spawnhandler on clients.</param>
         public void RegisterSpawnHandler(int prefabHash, SpawnHandlerDelegate spawnHandler, UnSpawnDelegate unspawnHandler)
         {
-            if (logger.LogEnabled()) logger.Log("RegisterSpawnHandler asset '" + prefabHash + "' " + spawnHandler.Method.Name + "/" + unspawnHandler.Method.Name);
-
+            if (logger.LogEnabled())
+            {
+                var spawnName = spawnHandler?.Method.Name ?? "<NULL>";
+                var unspawnName = unspawnHandler?.Method.Name ?? "<NULL>";
+                logger.Log($"RegisterSpawnHandler PrefabHash:'{prefabHash}' Spawn:{spawnName} UnSpawn:{unspawnName}");
+            }
+
             spawnHandlers[prefabHash] = spawnHandler;
             unspawnHandlers[prefabHash] = unspawnHandler;
         }