update and test additions

Updating the core components based on some bugs discovered during testing.
Updated the AttachableBehaviourTests to validate the different types of auto-detach flag combinations.
Fixed some spelling issues with "detatch" (not sure why I got into that habit)...corrected to "detach".

Author: NoelStephensUnity

com.unity.netcode.gameobjects/Runtime/Components/Helpers/AttachableBehaviour.cs

@@ -90,7 +90,10 @@ protected virtual void OnValidate()
                 // Wait for the next editor update to create a nested child and add the AttachableBehaviour
                 EditorApplication.update += CreatedNestedChild;
             }
-
+            if (ComponentControllers == null)
+            {
+                return;
+            }
             foreach (var componentController in ComponentControllers)
             {
                 if (componentController == null)
@@ -112,33 +115,33 @@ private void CreatedNestedChild()
         }
 #endif
         /// <summary>
-        /// Flags to determine if the <see cref="AttachableBehaviour"/> will automatically detatch.
+        /// Flags to determine if the <see cref="AttachableBehaviour"/> will automatically detach.
         /// </summary>
         [Flags]
-        public enum AutoDetatchTypes
+        public enum AutoDetachTypes
         {
             /// <summary>
             /// Disables auto detach.
             /// </summary>
             None,
             /// <summary>
-            /// Detatch on ownership change.
+            /// Detach on ownership change.
             /// </summary>
             OnOwnershipChange,
             /// <summary>
-            /// Detatch on despawn.
+            /// Detach on despawn.
             /// </summary>
             OnDespawn,
             /// <summary>
-            /// Detatch on destroy.
+            /// Detach on destroy.
             /// </summary>
             OnAttachNodeDestroy,
         }
 
         /// <summary>
-        /// Determines if this <see cref="AttachableBehaviour"/> will automatically detatch on all instances if it has one of the <see cref="AutoDetatchTypes"/> flags.
+        /// Determines if this <see cref="AttachableBehaviour"/> will automatically detach on all instances if it has one of the <see cref="AutoDetachTypes"/> flags.
         /// </summary>
-        public AutoDetatchTypes AutoDetach = AutoDetatchTypes.OnDespawn | AutoDetatchTypes.OnOwnershipChange | AutoDetatchTypes.OnAttachNodeDestroy;
+        public AutoDetachTypes AutoDetach = AutoDetachTypes.OnDespawn | AutoDetachTypes.OnOwnershipChange | AutoDetachTypes.OnAttachNodeDestroy;
 
         [SerializeField]
         internal List<ComponentControllerEntry> ComponentControllers;
@@ -252,29 +255,36 @@ protected override void OnNetworkSessionSynchronized()
             base.OnNetworkSessionSynchronized();
         }
 
-        internal void ForceDetatch()
+        internal void ForceDetach()
         {
             if (m_AttachState == AttachState.Detached || m_AttachState == AttachState.Detaching)
             {
                 return;
             }
 
             ForceComponentChange(false, true);
+
             InternalDetach();
-            if (NetworkManager && !NetworkManager.ShutdownInProgress)
+            // Notify of the changed attached state
+            UpdateAttachState(m_AttachState, m_AttachableNode);
+
+            m_AttachedNodeReference = new NetworkBehaviourReference(null);
+
+            // When detaching, we want to make our final action
+            // the invocation of the AttachableNode's Detach method.
+            if (m_AttachableNode)
             {
-                // Notify of the changed attached state
-                UpdateAttachState(m_AttachState, m_AttachableNode);
+                m_AttachableNode.Detach(this);
+                m_AttachableNode = null;
             }
-            m_AttachedNodeReference = new NetworkBehaviourReference(null);
         }
 
         /// <inheritdoc/>
         public override void OnNetworkPreDespawn()
         {
-            if (AutoDetach.HasFlag(AutoDetatchTypes.OnDespawn))
+            if (AutoDetach.HasFlag(AutoDetachTypes.OnDespawn))
             {
-                ForceDetatch();
+                ForceDetach();
             }
             base.OnNetworkDespawn();
         }
@@ -375,9 +385,9 @@ private void UpdateAttachState(AttachState attachState, AttachableNode attachabl
         /// <inheritdoc/>
         protected override void OnOwnershipChanged(ulong previous, ulong current)
         {
-            if (AutoDetach.HasFlag(AutoDetatchTypes.OnOwnershipChange))
+            if (AutoDetach.HasFlag(AutoDetachTypes.OnOwnershipChange))
             {
-                ForceDetatch();
+                ForceDetach();
             }
             base.OnOwnershipChanged(previous, current);
         }
@@ -551,11 +561,11 @@ private void UpdateAttachStateRpc(NetworkBehaviourReference attachedNodeReferenc
         /// </summary>
         internal void OnAttachNodeDestroy()
         {
-            // If this instance should force a detatch on destroy
-            if (AutoDetach.HasFlag(AutoDetatchTypes.OnAttachNodeDestroy))
+            // If this instance should force a detach on destroy
+            if (AutoDetach.HasFlag(AutoDetachTypes.OnAttachNodeDestroy))
             {
-                // Force a detatch
-                ForceDetatch();
+                // Force a detach
+                ForceDetach();
             }
         }
     }

com.unity.netcode.gameobjects/Runtime/Components/Helpers/AttachableNode.cs

@@ -43,9 +43,11 @@ protected override void OnNetworkPreSpawn(ref NetworkManager networkManager)
     /// </remarks>
     protected override void OnOwnershipChanged(ulong previous, ulong current)
     {
+        // Clear any known behaviours on all instances (really only the previous owner should know about AttachedBehaviours
+        m_AttachedBehaviours.Clear();
         if (current == NetworkManager.LocalClientId)
         {
-            m_AttachedBehaviours.Clear();
+            // Rebuild the list of AttachableBehaviours for the new owner
             var attachables = NetworkObject.transform.GetComponentsInChildren<AttachableBehaviour>();
             foreach (var attachable in attachables)
             {
@@ -69,7 +71,21 @@ public override void OnNetworkPreDespawn()
         {
             for (int i = m_AttachedBehaviours.Count - 1; i >= 0; i--)
             {
-                m_AttachedBehaviours[i]?.Detach();
+                if (!m_AttachedBehaviours[i])
+                {
+                    continue;
+                }
+                // If we don't have authority but should detach on despawn,
+                // then proceed to detach.
+                if (!m_AttachedBehaviours[i].HasAuthority)
+                {
+                    m_AttachedBehaviours[i].ForceDetach();
+                }
+                else
+                {
+                    // Detach the normal way with authority
+                    m_AttachedBehaviours[i].Detach();
+                }
             }
         }
         base.OnNetworkPreDespawn();