Merge develop into feature/isdebug-flag-for-connection-approval

Author: netcode-ci-service

Assets/BossRoom/Scripts/Server/Game/Character/ServerCharacterMovement.cs

@@ -55,20 +55,21 @@ public class ServerCharacterMovement : NetworkBehaviour
         private void Awake()
         {
             m_NavigationSystem = GameObject.FindGameObjectWithTag(NavigationSystem.NavigationSystemTag).GetComponent<NavigationSystem>();
+            // disable this NetworkBehavior until it is spawned
+            enabled = false;
         }
 
         public override void OnNetworkSpawn()
         {
-            if (!IsServer)
+            if (IsServer)
             {
-                // Disable server component on clients
-                enabled = false;
-                return;
-            }
+                // Only enable server component on servers
+                enabled = true;
 
-            // On the server enable navMeshAgent and initialize
-            m_NavMeshAgent.enabled = true;
-            m_NavPath = new DynamicNavPath(m_NavMeshAgent, m_NavigationSystem);
+                // On the server enable navMeshAgent and initialize
+                m_NavMeshAgent.enabled = true;
+                m_NavPath = new DynamicNavPath(m_NavMeshAgent, m_NavigationSystem);
+            }
         }
 
         /// <summary>
@@ -177,6 +178,12 @@ public override void OnNetworkDespawn()
             {
                 m_NavPath.Dispose();
             }
+            if (IsServer)
+            {
+                // Disable server components when despawning
+                enabled = false;
+                m_NavMeshAgent.enabled = false;
+            }
         }
 
         private void PerformMovement()