fix: SceneId was not set to 0 for prefab variants (#976) (#977)

* fix: SceneId was not set to 0 for prefab variants (#976) * Update NetworkIdentity.cs
MirageNet · Jul 31, 2019 · 2ca2c48 · 2ca2c48
1 parent 246a551
commit 2ca2c48
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/Assets/Mirror/Runtime/NetworkIdentity.cs b/Assets/Mirror/Runtime/NetworkIdentity.cs
@@ -361,17 +361,19 @@ void SetupIDs()
                 m_SceneId = 0; // force 0 for prefabs
                 AssignAssetID(gameObject);
             }
-            else if (ThisIsASceneObjectWithPrefabParent(out GameObject prefab))
-            {
-                AssignSceneID();
-                AssignAssetID(prefab);
-            }
+            // check prefabstage BEFORE SceneObjectWithPrefabParent
+            // (fixes https://github.com/vis2k/Mirror/issues/976)
             else if (PrefabStageUtility.GetCurrentPrefabStage() != null)
             {
                 m_SceneId = 0; // force 0 for prefabs
                 string path = PrefabStageUtility.GetCurrentPrefabStage().prefabAssetPath;
                 AssignAssetID(path);
             }
+            else if (ThisIsASceneObjectWithPrefabParent(out GameObject prefab))
+            {
+                AssignSceneID();
+                AssignAssetID(prefab);
+            }
             else
             {
                 AssignSceneID();