fix: imps self-destroying on clients when late-joining with multiple additive scenes loaded (#574)

* Disabled ClientCharacterVisualization before OnNetworkSpawn

* Removed Parent property from ClientCharacterVisualization and added public property to get NetState

Author: LPLafontaineB

Assets/BossRoom/Scripts/Client/Game/Action/FXProjectileTargetedActionFX.cs

@@ -120,8 +120,7 @@ private NetworkObject GetTarget()
         /// </summary>
         private bool IsParentAnNPC()
         {
-            var targetable = m_Parent.Parent.GetComponent<ITargetable>();
-            return targetable.IsNpc;
+            return m_Parent.NetState.IsNpc;
         }
 
 

Assets/BossRoom/Scripts/Client/Game/Action/TargetActionFX.cs

@@ -22,7 +22,7 @@ public TargetActionFX(ref ActionRequestData data, ClientCharacterVisualization p
         public override bool Start()
         {
             base.Start();
-            m_ParentState = m_Parent.Parent.GetComponent<NetworkCharacterState>();
+            m_ParentState = m_Parent.NetState;
 
             m_ParentState.TargetId.OnValueChanged += OnTargetChanged;
             m_ParentState.GetComponent<Client.ClientInputSender>().ActionInputEvent += OnActionInput;

Assets/BossRoom/Scripts/Client/Game/Character/ClientCharacterVisualization.cs

@@ -39,18 +39,14 @@ public class ClientCharacterVisualization : NetworkBehaviour
         /// </summary>
         public Material ReticuleFriendlyMat => m_VisualizationConfiguration.ReticuleFriendlyMat;
 
-        /// <summary>
-        /// Returns our pseudo-Parent, the object that owns the visualization.
-        /// (We don't have an actual transform parent because we're on a top-level GameObject.)
-        /// </summary>
-        public Transform Parent { get; private set; }
-
         PhysicsWrapper m_PhysicsWrapper;
 
         public bool CanPerformActions => m_NetState.CanPerformActions;
 
         NetworkCharacterState m_NetState;
 
+        public NetworkCharacterState NetState => m_NetState;
+
         ActionVisualization m_ActionViz;
 
         PositionLerper m_PositionLerper;
@@ -64,20 +60,24 @@ public class ClientCharacterVisualization : NetworkBehaviour
 
         Quaternion m_LerpedRotation;
 
+        void Awake()
+        {
+            enabled = false;
+        }
+
         public override void OnNetworkSpawn()
         {
             if (!IsClient || transform.parent == null)
             {
-                enabled = false;
                 return;
             }
 
+            enabled = true;
+
             m_ActionViz = new ActionVisualization(this);
 
             m_NetState = GetComponentInParent<NetworkCharacterState>();
 
-            Parent = m_NetState.transform;
-
             m_PhysicsWrapper = m_NetState.GetComponent<PhysicsWrapper>();
 
             m_NetState.DoActionEventClient += PerformActionFX;
@@ -99,7 +99,7 @@ public override void OnNetworkSpawn()
             {
                 name = "AvatarGraphics" + m_NetState.OwnerClientId;
 
-                if (Parent.TryGetComponent(out ClientAvatarGuidHandler clientAvatarGuidHandler))
+                if (m_NetState.TryGetComponent(out ClientAvatarGuidHandler clientAvatarGuidHandler))
                 {
                     m_ClientVisualsAnimator = clientAvatarGuidHandler.graphicsAnimator;
                 }
@@ -115,7 +115,7 @@ public override void OnNetworkSpawn()
                     m_ActionViz.PlayAction(ref data);
                     gameObject.AddComponent<CameraController>();
 
-                    if (Parent.TryGetComponent(out ClientInputSender inputSender))
+                    if (m_NetState.TryGetComponent(out ClientInputSender inputSender))
                     {
                         // TODO: revisit; anticipated actions would play twice on the host
                         if (!IsServer)
@@ -128,22 +128,8 @@ public override void OnNetworkSpawn()
             }
         }
 
-        void OnActionInput(ActionRequestData data)
-        {
-            m_ActionViz.AnticipateAction(ref data);
-        }
-
-        void OnMoveInput(Vector3 position)
-        {
-            if (!IsAnimating())
-            {
-                OurAnimator.SetTrigger(m_VisualizationConfiguration.AnticipateMoveTriggerID);
-            }
-        }
-
-        public override void OnDestroy()
+        public override void OnNetworkDespawn()
         {
-            base.OnDestroy();
             if (m_NetState)
             {
                 m_NetState.DoActionEventClient -= PerformActionFX;
@@ -152,12 +138,27 @@ public override void OnDestroy()
                 m_NetState.OnStopChargingUpClient -= OnStoppedChargingUp;
                 m_NetState.IsStealthy.OnValueChanged -= OnStealthyChanged;
 
-                if (Parent != null && Parent.TryGetComponent(out ClientInputSender sender))
+                if (m_NetState.TryGetComponent(out ClientInputSender sender))
                 {
                     sender.ActionInputEvent -= OnActionInput;
                     sender.ClientMoveEvent -= OnMoveInput;
                 }
             }
+
+            enabled = false;
+        }
+
+        void OnActionInput(ActionRequestData data)
+        {
+            m_ActionViz.AnticipateAction(ref data);
+        }
+
+        void OnMoveInput(Vector3 position)
+        {
+            if (!IsAnimating())
+            {
+                OurAnimator.SetTrigger(m_VisualizationConfiguration.AnticipateMoveTriggerID);
+            }
         }
 
         void PerformActionFX(ActionRequestData data)
@@ -238,13 +239,6 @@ float GetVisualMovementSpeed()
 
         void Update()
         {
-            if (Parent == null)
-            {
-                // since we aren't in the transform hierarchy, we have to explicitly die when our parent dies.
-                Destroy(gameObject);
-                return;
-            }
-
             // On the host, Characters are translated via ServerCharacterMovement's FixedUpdate method. To ensure that
             // the game camera tracks a GameObject moving in the Update loop and therefore eliminate any camera jitter,
             // this graphics GameObject's position is smoothed over time on the host. Clients do not need to perform any