refactor(NetworkIdentity): removing NetworkIdentity.GetSceneIdentity

Removing static field left over from mirror. only used at access internal collection sceneIds. sceneIds only exist to check if there are any duplicate scene ids BREAKING CHANGE: `NetworkIdentity.GetSceneIdentity` has been removed
MirageNet · Oct 21, 2021 · 34699ae · 34699ae
1 parent a72d777
commit 34699ae
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/Assets/Mirage/Runtime/NetworkIdentity.cs b/Assets/Mirage/Runtime/NetworkIdentity.cs
@@ -304,10 +304,7 @@ internal set
             }
         }
 
-        /// <summary>
-        /// Keep track of all sceneIds to detect scene duplicates
-        /// </summary>
-        static readonly Dictionary<ulong, NetworkIdentity> sceneIds = new Dictionary<ulong, NetworkIdentity>();
+
 
         [Header("Events")]
         [SerializeField] AddLateEvent _onStartServer = new AddLateEvent();
@@ -367,13 +364,6 @@ internal set
         /// <remarks>Can be used as hook to save player information</remarks>
         public IAddLateEvent OnStopServer => _onStopServer;
 
-        /// <summary>
-        /// Gets the NetworkIdentity from the sceneIds dictionary with the corresponding id
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns>NetworkIdentity from the sceneIds dictionary</returns>
-        public static NetworkIdentity GetSceneIdentity(ulong id) => sceneIds[id];
-
         /// <summary>
         /// used when adding players
         /// </summary>
@@ -445,6 +435,11 @@ void OnValidate()
         }
 
 #if UNITY_EDITOR
+        /// <summary>
+        /// Keep track of all sceneIds to detect scene duplicates
+        /// </summary>
+        internal static readonly Dictionary<ulong, NetworkIdentity> sceneIds = new Dictionary<ulong, NetworkIdentity>();
+
         void AssignAssetID(GameObject prefab) => AssignAssetID(AssetDatabase.GetAssetPath(prefab));
 
         void AssignAssetID(string path) => m_AssetId = AssetDatabase.AssetPathToGUID(path);

diff --git a/Assets/Tests/Editor/NetworkIdentityCallbackTests.cs b/Assets/Tests/Editor/NetworkIdentityCallbackTests.cs
@@ -285,14 +285,14 @@ public void RemoveObserverInternal()
         [Test]
         public void AssignSceneID()
         {
-            // Awake will have assigned a random sceneId of format 0x00000000FFFFFFFF
+            // OnValidate will have assigned a random sceneId of format 0x00000000FFFFFFFF
             // -> make sure that one was assigned, and that the left part was
             //    left empty for scene hash
-            Assert.That(identity.sceneId, !Is.Zero);
+            Assert.That(identity.sceneId, Is.Not.Zero);
             Assert.That(identity.sceneId & 0xFFFFFFFF00000000, Is.EqualTo(0x0000000000000000));
 
-            // make sure that Awake added it to sceneIds dict
-            Assert.That(NetworkIdentity.GetSceneIdentity(identity.sceneId), !Is.Null);
+            // make sure that OnValidate added it to sceneIds dict
+            Assert.That(NetworkIdentity.sceneIds[identity.sceneId], Is.Not.Null);
         }
 
         [Test]