fix: globalobjectidhash printing in editor, remove istestrun flag (#774)

* fix globalobjectidhash in editor

* remove IsTestRun flag entirely, no longer needed

* minor update

* add comments around conditions

* minor update

Author: 0xFA11

com.unity.multiplayer.mlapi/Runtime/Core/NetworkManager.cs

@@ -209,8 +209,6 @@ public ulong LocalClientId
         internal static event Action OnSingletonReady;
 
 #if UNITY_EDITOR
-        internal static bool IsTestRun = false;
-
         private void OnValidate()
         {
             if (NetworkConfig == null)
@@ -321,7 +319,7 @@ private void Init(bool server)
             SpawnManager = new NetworkSpawnManager(this);
 
             CustomMessagingManager = new CustomMessagingManager(this);
-            
+
             BufferManager = new BufferManager(this);
 
             SceneManager = new NetworkSceneManager(this);
@@ -383,7 +381,7 @@ private void Init(bool server)
                 SceneManager.SetCurrentSceneIndex();
             }
 
-            // This is used to remove entries not needed or invalid 
+            // This is used to remove entries not needed or invalid
             var removeEmptyPrefabs = new List<int>();
 
             // Always clear our prefab override links before building
@@ -457,7 +455,7 @@ private void Init(bool server)
                     {
                         //Then add a new entry for the player prefab
                         var playerNetworkPrefab = new NetworkPrefab();
-                        playerNetworkPrefab.Prefab = NetworkConfig.PlayerPrefab;                        
+                        playerNetworkPrefab.Prefab = NetworkConfig.PlayerPrefab;
                         NetworkConfig.NetworkPrefabs.Insert(0, playerNetworkPrefab);
                         NetworkConfig.NetworkPrefabOverrideLinks.Add(playerPrefabNetworkObject.GlobalObjectIdHash, playerNetworkPrefab);
                     }

com.unity.multiplayer.mlapi/Runtime/Core/NetworkObject.cs

@@ -6,7 +6,6 @@
 using MLAPI.Exceptions;
 using MLAPI.Hashing;
 using MLAPI.Logging;
-using MLAPI.Messaging;
 using MLAPI.Serialization.Pooled;
 using MLAPI.Transports;
 using UnityEngine;
@@ -27,9 +26,15 @@ public sealed class NetworkObject : MonoBehaviour
 #if UNITY_EDITOR
         private void OnValidate()
         {
-            if (UnityEditor.EditorApplication.isPlayingOrWillChangePlaymode && !NetworkManager.IsTestRun)
+            // do NOT regenerate GlobalObjectIdHash for NetworkPrefabs while Editor is in PlayMode
+            if (UnityEditor.EditorApplication.isPlaying && !string.IsNullOrEmpty(gameObject.scene.name))
+            {
+                return;
+            }
+
+            // do NOT regenerate GlobalObjectIdHash if Editor is transitining into or out of PlayMode
+            if (!UnityEditor.EditorApplication.isPlaying && UnityEditor.EditorApplication.isPlayingOrWillChangePlaymode)
             {
-                // do NOT override GlobalObjectIdHash while getting into PlayMode in the Editor
                 return;
             }
 

com.unity.multiplayer.mlapi/Tests/Runtime/GlobalObjectIdHash/NetworkPrefabGlobalObjectIdHashTests.cs

@@ -25,8 +25,6 @@ private void OnSceneLoaded(Scene scene, LoadSceneMode mode)
         [UnitySetUp]
         public IEnumerator Setup()
         {
-            NetworkManager.IsTestRun = true;
-
             SceneManager.sceneLoaded += OnSceneLoaded;
 
             var execAssembly = Assembly.GetExecutingAssembly();
@@ -45,8 +43,6 @@ public IEnumerator Teardown()
             {
                 yield return SceneManager.UnloadSceneAsync(m_TestScene);
             }
-
-            NetworkManager.IsTestRun = false;
         }
 
         [Test]