Skip to content

Commit 05ce9cc

Browse files
committed
fix: NetworkAnimator initialization sequencing
1 parent 3827b10 commit 05ce9cc

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

com.unity.netcode.gameobjects/Runtime/Components/NetworkAnimator.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -720,13 +720,16 @@ internal AnimationMessage GetAnimationMessage()
720720
return m_AnimationMessage;
721721
}
722722

723-
/// <inheritdoc/>
724-
public override void OnNetworkSpawn()
723+
internal override void InternalOnNetworkPreSpawn(ref NetworkManager networkManager)
725724
{
726725
// Save internal state references
727-
m_LocalNetworkManager = NetworkManager;
726+
m_LocalNetworkManager = networkManager;
728727
DistributedAuthorityMode = m_LocalNetworkManager.DistributedAuthorityMode;
728+
}
729729

730+
/// <inheritdoc/>
731+
public override void OnNetworkSpawn()
732+
{
730733
// If there is no assigned Animator then generate a server network warning (logged locally and if applicable on the server-host side as well).
731734
if (m_Animator == null)
732735
{

com.unity.netcode.gameobjects/Runtime/Core/NetworkBehaviour.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -753,6 +753,8 @@ public virtual void OnNetworkDespawn() { }
753753
/// </summary>
754754
public virtual void OnNetworkPreDespawn() { }
755755

756+
internal virtual void InternalOnNetworkPreSpawn(ref NetworkManager networkManager) { }
757+
756758
internal void NetworkPreSpawn(ref NetworkManager networkManager, NetworkObject networkObject)
757759
{
758760
m_NetworkObject = networkObject;
@@ -761,6 +763,8 @@ internal void NetworkPreSpawn(ref NetworkManager networkManager, NetworkObject n
761763

762764
UpdateNetworkProperties();
763765

766+
InternalOnNetworkPreSpawn(ref networkManager);
767+
764768
// Exit early for disabled NetworkBehaviours.
765769
// We still want the above values to be set.
766770
if (!gameObject.activeInHierarchy)

0 commit comments

Comments
 (0)