fix: access NI on disabled objects (#383)

MirageNet · Oct 5, 2020 · 0ab4c60 · 0ab4c60
1 parent 64fd6ed
commit 0ab4c60
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/Assets/Mirror/Runtime/NetworkBehaviour.cs b/Assets/Mirror/Runtime/NetworkBehaviour.cs
@@ -146,7 +146,14 @@ public NetworkIdentity NetIdentity
                 // instead of calling unity's MonoBehaviour == operator
                 if (((object)netIdentityCache) == null)
                 {
-                    netIdentityCache = GetComponentInParent<NetworkIdentity>();
+                    // GetComponentInParent doesn't works on disabled gameobjecs
+                    // and GetComponentsInParent(false)[0] isn't allocation free, so
+                    // we just drop child support in this specific case
+                    if (gameObject.activeSelf)
+                        netIdentityCache = GetComponentInParent<NetworkIdentity>();
+                    else
+                        netIdentityCache = GetComponent<NetworkIdentity>();
+
                     // do this 2nd check inside first if so that we are not checking == twice on unity Object
                     if (netIdentityCache == null)
                     {