update

Making NetworkAnimator strictly server authoritative.

Author: NoelStephensUnity

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

@@ -57,8 +57,8 @@ public void NetworkUpdate(NetworkUpdateStage updateStage)
                         }
                         m_ProcessParameterUpdates.Clear();
 
-                        // Only owners check for Animator changes
-                        if (m_NetworkAnimator.IsOwner && !m_NetworkAnimator.IsServerAuthoritative || m_NetworkAnimator.IsServerAuthoritative && m_NetworkAnimator.NetworkManager.IsServer)
+                        // Only server checks for Animator changes
+                        if (m_NetworkAnimator.NetworkManager.IsServer)
                         {
                             m_NetworkAnimator.CheckForAnimatorChanges();
                         }
@@ -208,42 +208,6 @@ public Animator Animator
             }
         }
 
-        [Tooltip("When enabled, the NetworkAnimator will operate in server authoritative mode.")]
-        [SerializeField]
-        private bool m_IsServerAuthoritative;
-
-        /// <summary>
-        /// Server-Side Only:
-        /// Can be used to switch between server and owner authoritative modes during runtime.
-        /// Note: Only when the associated NetworkObject is spawned.
-        /// </summary>
-        public bool IsServerAuthoritative
-        {
-            get
-            {
-                return m_IsServerAuthoritative;
-            }
-            set
-            {
-                if (!IsSpawned)
-                {
-                    m_IsServerAuthoritative = value;
-                }
-                else if (IsSpawned && IsServer)
-                {
-                    m_IsServerAuthoritative = value;
-                    m_ServerAuthoritativeMode.Value = value;
-                }
-            }
-        }
-
-        private NetworkVariable<bool> m_ServerAuthoritativeMode = new NetworkVariable<bool>();
-
-        private void OnServerAuthoritativeModeChanged(bool previous, bool next)
-        {
-            m_IsServerAuthoritative = next;
-        }
-
         // Animators only support up to 32 params
         private const int k_MaxAnimationParams = 32;
 
@@ -327,7 +291,6 @@ public override void OnNetworkSpawn()
                 if (IsServer)
                 {
                     NetworkManager.OnClientConnectedCallback += OnClientConnectedCallback;
-                    m_ServerAuthoritativeMode.Value = m_IsServerAuthoritative;
                 }
 
                 // Store off our current layer weights
@@ -349,11 +312,6 @@ public override void OnNetworkSpawn()
                 }
             }
 
-            if (!IsServer)
-            {
-                m_ServerAuthoritativeMode.OnValueChanged = OnServerAuthoritativeModeChanged;
-            }
-
             var parameters = m_Animator.parameters;
             m_CachedAnimatorParameters = new NativeArray<AnimatorParamCache>(parameters.Length, Allocator.Persistent);
             m_ParametersToUpdate = new List<int>(parameters.Length);
@@ -477,7 +435,7 @@ private void OnClientConnectedCallback(ulong playerId)
 
         internal void CheckForAnimatorChanges()
         {
-            if (!IsOwner && !IsServerAuthoritative || m_IsServerAuthoritative && !IsServer)
+            if (!IsServer)
             {
                 return;
             }
@@ -791,27 +749,11 @@ private unsafe void UpdateAnimationState(AnimationMessage animationState)
         [ServerRpc]
         private unsafe void SendParametersUpdateServerRpc(ParametersUpdateMessage parametersUpdate, ServerRpcParams serverRpcParams = default)
         {
-            if (IsServerAuthoritative)
-            {
-                m_NetworkAnimatorStateChangeHandler.SendParameterUpdate(parametersUpdate);
-            }
-            else
+            if (serverRpcParams.Receive.SenderClientId != OwnerClientId)
             {
-                if (serverRpcParams.Receive.SenderClientId != OwnerClientId)
-                {
-                    return;
-                }
-                UpdateParameters(parametersUpdate);
-                if (NetworkManager.ConnectedClientsIds.Count - 2 > 0)
-                {
-                    m_ClientSendList.Clear();
-                    m_ClientSendList.AddRange(NetworkManager.ConnectedClientsIds);
-                    m_ClientSendList.Remove(serverRpcParams.Receive.SenderClientId);
-                    m_ClientSendList.Remove(NetworkManager.ServerClientId);
-                    m_ClientRpcParams.Send.TargetClientIds = m_ClientSendList;
-                    m_NetworkAnimatorStateChangeHandler.SendParameterUpdate(parametersUpdate, m_ClientRpcParams);
-                }
+                return;
             }
+            m_NetworkAnimatorStateChangeHandler.SendParameterUpdate(parametersUpdate);
         }
 
         /// <summary>
@@ -820,10 +762,7 @@ private unsafe void SendParametersUpdateServerRpc(ParametersUpdateMessage parame
         [ClientRpc]
         internal unsafe void SendParametersUpdateClientRpc(ParametersUpdateMessage parametersUpdate, ClientRpcParams clientRpcParams = default)
         {
-            if (!IsServerAuthoritative && !IsOwner || IsServerAuthoritative)
-            {
-                m_NetworkAnimatorStateChangeHandler.ProcessParameterUpdate(parametersUpdate);
-            }
+            m_NetworkAnimatorStateChangeHandler.ProcessParameterUpdate(parametersUpdate);
         }
 
         /// <summary>
@@ -833,27 +772,12 @@ internal unsafe void SendParametersUpdateClientRpc(ParametersUpdateMessage param
         [ServerRpc]
         private unsafe void SendAnimStateServerRpc(AnimationMessage animSnapshot, ServerRpcParams serverRpcParams = default)
         {
-            if (IsServerAuthoritative)
+            if (serverRpcParams.Receive.SenderClientId != OwnerClientId)
             {
-                m_NetworkAnimatorStateChangeHandler.SendAnimationUpdate(animSnapshot);
-            }
-            else
-            {
-                if (serverRpcParams.Receive.SenderClientId != OwnerClientId)
-                {
-                    return;
-                }
-                UpdateAnimationState(animSnapshot);
-                if (NetworkManager.ConnectedClientsIds.Count - 2 > 0)
-                {
-                    m_ClientSendList.Clear();
-                    m_ClientSendList.AddRange(NetworkManager.ConnectedClientsIds);
-                    m_ClientSendList.Remove(serverRpcParams.Receive.SenderClientId);
-                    m_ClientSendList.Remove(NetworkManager.ServerClientId);
-                    m_ClientRpcParams.Send.TargetClientIds = m_ClientSendList;
-                    m_NetworkAnimatorStateChangeHandler.SendAnimationUpdate(animSnapshot, m_ClientRpcParams);
-                }
+                return;
             }
+
+            m_NetworkAnimatorStateChangeHandler.SendAnimationUpdate(animSnapshot);
         }
 
         /// <summary>
@@ -862,10 +786,7 @@ private unsafe void SendAnimStateServerRpc(AnimationMessage animSnapshot, Server
         [ClientRpc]
         private unsafe void SendAnimStateClientRpc(AnimationMessage animSnapshot, ClientRpcParams clientRpcParams = default)
         {
-            if (!IsServerAuthoritative && !IsOwner || IsServerAuthoritative)
-            {
-                UpdateAnimationState(animSnapshot);
-            }
+            UpdateAnimationState(animSnapshot);
         }
 
         /// <summary>
@@ -875,30 +796,11 @@ private unsafe void SendAnimStateClientRpc(AnimationMessage animSnapshot, Client
         [ServerRpc]
         private void SendAnimTriggerServerRpc(AnimationTriggerMessage animationTriggerMessage, ServerRpcParams serverRpcParams = default)
         {
-            if (IsServerAuthoritative)
+            if (serverRpcParams.Receive.SenderClientId != OwnerClientId)
             {
-                m_NetworkAnimatorStateChangeHandler.SendTriggerUpdate(animationTriggerMessage);
-            }
-            else
-            {
-                if (serverRpcParams.Receive.SenderClientId != OwnerClientId)
-                {
-                    return;
-                }
-                //  trigger the animation locally on the server...
-                m_Animator.SetBool(animationTriggerMessage.Hash, animationTriggerMessage.IsTriggerSet);
-
-                if (NetworkManager.ConnectedClientsIds.Count - 2 > 0)
-                {
-                    m_ClientSendList.Clear();
-                    m_ClientSendList.AddRange(NetworkManager.ConnectedClientsIds);
-                    m_ClientSendList.Remove(serverRpcParams.Receive.SenderClientId);
-                    m_ClientSendList.Remove(NetworkManager.ServerClientId);
-                    m_ClientRpcParams.Send.TargetClientIds = m_ClientSendList;
-                    m_NetworkAnimatorStateChangeHandler.SendTriggerUpdate(animationTriggerMessage, m_ClientRpcParams);
-                }
+                return;
             }
-
+            m_NetworkAnimatorStateChangeHandler.SendTriggerUpdate(animationTriggerMessage);
         }
 
         /// <summary>
@@ -910,10 +812,7 @@ private void SendAnimTriggerServerRpc(AnimationTriggerMessage animationTriggerMe
         [ClientRpc]
         internal void SendAnimTriggerClientRpc(AnimationTriggerMessage animationTriggerMessage, ClientRpcParams clientRpcParams = default)
         {
-            if (!IsServerAuthoritative && !IsOwner || IsServerAuthoritative)
-            {
-                m_Animator.SetBool(animationTriggerMessage.Hash, animationTriggerMessage.IsTriggerSet);
-            }
+            m_Animator.SetBool(animationTriggerMessage.Hash, animationTriggerMessage.IsTriggerSet);
         }
 
         /// <summary>
@@ -930,7 +829,7 @@ public void SetTrigger(string triggerName)
         /// <param name="reset">If true, resets the trigger</param>
         public void SetTrigger(int hash, bool setTrigger = true)
         {
-            if (IsOwner && !IsServerAuthoritative || IsServer && IsServerAuthoritative)
+            if (IsOwner || IsServer)
             {
                 var animTriggerMessage = new AnimationTriggerMessage() { Hash = hash, IsTriggerSet = setTrigger };
                 if (IsServer)
@@ -941,8 +840,7 @@ public void SetTrigger(int hash, bool setTrigger = true)
                 {
                     SendAnimTriggerServerRpc(animTriggerMessage);
                 }
-                //  trigger the animation locally on the server...
-                m_Animator.SetBool(hash, setTrigger);
+
             }
         }
 

testproject/Assets/Tests/Manual/NetworkAnimatorTests/AnimatedCubeController.cs

@@ -32,32 +32,13 @@ public override void OnNetworkSpawn()
 
         private bool HasAuthority()
         {
-            if (IsOwnerAuthority() || IsServerAuthority())
+            if (IsServer || IsOwner)
             {
                 return true;
             }
             return false;
         }
 
-        private bool IsServerAuthority()
-        {
-            if (IsServer && m_NetworkAnimator.IsServerAuthoritative)
-            {
-                return true;
-            }
-            return false;
-        }
-
-        private bool IsOwnerAuthority()
-        {
-            if (IsOwner && m_NetworkAnimator.IsServerAuthoritative)
-            {
-                return true;
-            }
-            return false;
-        }
-
-
         [ServerRpc(RequireOwnership = false)]
         private void ToggleRotateAnimationServerRpc(bool rotate)
         {
@@ -68,18 +49,11 @@ private void ToggleRotateAnimationServerRpc(bool rotate)
         internal void ToggleRotateAnimation()
         {
             m_Rotate = !m_Rotate;
-            if (m_NetworkAnimator.IsServerAuthoritative)
+            if (!IsServer && IsOwner)
             {
-                if (!IsServer && IsOwner)
-                {
-                    ToggleRotateAnimationServerRpc(m_Rotate);
-                }
-                else if (IsServer && IsOwner)
-                {
-                    m_Animator.SetBool("Rotate", m_Rotate);
-                }
+                ToggleRotateAnimationServerRpc(m_Rotate);
             }
-            else if (IsOwner)
+            else if (IsServer && IsOwner)
             {
                 m_Animator.SetBool("Rotate", m_Rotate);
             }
@@ -93,18 +67,11 @@ private void PlayPulseAnimationServerRpc(bool rotate)
 
         internal void PlayPulseAnimation()
         {
-            if (m_NetworkAnimator.IsServerAuthoritative)
+            if (!IsServer && IsOwner)
             {
-                if (!IsServer && IsOwner)
-                {
-                    PlayPulseAnimationServerRpc(m_Rotate);
-                }
-                else if (IsServer && IsOwner)
-                {
-                    m_NetworkAnimator.SetTrigger("Pulse");
-                }
+                PlayPulseAnimationServerRpc(m_Rotate);
             }
-            else if (IsOwner)
+            else if (IsServer && IsOwner)
             {
                 m_NetworkAnimator.SetTrigger("Pulse");
             }