fix: do not override GlobalObjectIdHash in Editor (#744)

* fix: do not override GlobalObjectIdHash in Editor

* squash

Author: 0xFA11

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

@@ -201,6 +201,9 @@ public ulong LocalClientId
 
         internal static event Action OnSingletonReady;
 
+#if UNITY_EDITOR
+        internal static bool IsTestRun = false;
+        
         private void OnValidate()
         {
             if (NetworkConfig == null)
@@ -226,7 +229,6 @@ private void OnValidate()
                 }
 
                 NetworkConfig.RegisteredScenes.Add(activeSceneName);
-#if UNITY_EDITOR
                 UnityEditor.EditorApplication.delayCall += () =>
                 {
                     if (!UnityEditor.EditorApplication.isPlaying)
@@ -235,7 +237,6 @@ private void OnValidate()
                         UnityEditor.SceneManagement.EditorSceneManager.MarkSceneDirty(activeScene);
                     }
                 };
-#endif
             }
 
             for (int i = 0; i < NetworkConfig.NetworkPrefabs.Count; i++)
@@ -272,6 +273,7 @@ private void OnValidate()
             var networkPrefab = NetworkConfig.NetworkPrefabs.FirstOrDefault(x => x.IsPlayer);
             NetworkConfig.PlayerPrefabHash = networkPrefab?.Hash ?? (uint)0;
         }
+#endif
 
         private void Init(bool server)
         {

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

@@ -7,7 +7,6 @@
 using MLAPI.Logging;
 using MLAPI.Messaging;
 using MLAPI.Serialization.Pooled;
-using MLAPI.Spawning;
 using MLAPI.Transports;
 using UnityEngine;
 
@@ -27,6 +26,12 @@ public sealed class NetworkObject : MonoBehaviour
 #if UNITY_EDITOR
         private void OnValidate()
         {
+            if (UnityEditor.EditorApplication.isPlayingOrWillChangePlaymode && !NetworkManager.IsTestRun)
+            {
+                // do NOT override GlobalObjectIdHash while getting into PlayMode in the Editor
+                return;
+            }
+
             var globalObjectIdString = UnityEditor.GlobalObjectId.GetGlobalObjectIdSlow(this).ToString();
             GlobalObjectIdHash = XXHash.Hash32(globalObjectIdString);
         }
@@ -333,7 +338,7 @@ public static void NetworkHide(List<NetworkObject> networkObjects, ulong clientI
 
         private void OnDestroy()
         {
-            if (NetworkManager.Singleton != null && NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(NetworkObjectId))
+            if (NetworkManager.Singleton != null && NetworkManager.Singleton.SpawnManager != null && NetworkManager.Singleton.SpawnManager.SpawnedObjects.ContainsKey(NetworkObjectId))
             {
                 NetworkManager.Singleton.SpawnManager.OnDestroyObject(NetworkObjectId, false);
             }

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

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