feat: NetworkBehaviors can be added to child gameobjects (#371)

* feat: NI can also find components in children * NB no longer requires a NI, it can be in the parent * Find disabled ones too
MirageNet · Sep 30, 2020 · 266dc8d · 266dc8d
1 parent 6d04228
commit 266dc8d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Assets/Mirror/Runtime/NetworkBehaviour.cs b/Assets/Mirror/Runtime/NetworkBehaviour.cs
@@ -20,7 +20,6 @@ public enum SyncMode { Observers, Owner }
     /// <para>Some of the built-in components of the networking system are derived from NetworkBehaviour, including NetworkTransport, NetworkAnimator and NetworkProximityChecker.</para>
     /// </remarks>
     [AddComponentMenu("")]
-    [RequireComponent(typeof(NetworkIdentity))]
     [HelpURL("https://mirror-networking.com/docs/Guides/NetworkBehaviour.html")]
     public abstract class NetworkBehaviour : MonoBehaviour
     {
@@ -147,7 +146,7 @@ public NetworkIdentity NetIdentity
                 // instead of calling unity's MonoBehaviour == operator
                 if (((object)netIdentityCache) == null)
                 {
-                    netIdentityCache = GetComponent<NetworkIdentity>();
+                    netIdentityCache = GetComponentInParent<NetworkIdentity>();
                     // do this 2nd check inside first if so that we are not checking == twice on unity Object
                     if (netIdentityCache == null)
                     {

diff --git a/Assets/Mirror/Runtime/NetworkIdentity.cs b/Assets/Mirror/Runtime/NetworkIdentity.cs
@@ -205,7 +205,7 @@ public NetworkBehaviour[] NetworkBehaviours
                 if (networkBehavioursCache != null)
                     return networkBehavioursCache;
 
-                NetworkBehaviour[] components = GetComponents<NetworkBehaviour>();
+                NetworkBehaviour[] components = GetComponentsInChildren<NetworkBehaviour>(true);
 
                 if (components.Length > 64)
                     throw new InvalidOperationException("Only 64 NetworkBehaviour per gameobject allowed");