Skip to content

fix: remove ServerAnimationHandler OnNetworkSpawn workaround [MTT-3152] #783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

fix: remove ServerAnimationHandler OnNetworkSpawn workaround [MTT-3152] #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
47370fe
removing unnecessary workaround to sync players' life states
fernando-cortez Nov 10, 2022
3f7c235
changelog addition, null check
fernando-cortez Nov 21, 2022
9c82742
merge develop
fernando-cortez Jun 21, 2023
aac0a7f
changelog cleanup, no need to force update on animator
fernando-cortez Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Assets/Scripts/Gameplay/GameplayObjects/Character/ClientAvatarGuidHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ void InstantiateAvatar()
Instantiate(m_NetworkAvatarGuidState.RegisteredAvatar.Graphics, m_GraphicsAnimator.transform);

m_GraphicsAnimator.Rebind();
m_GraphicsAnimator.Update(0f);

AvatarGraphicsSpawned?.Invoke(m_GraphicsAnimator.gameObject);
}
Expand Down
16 changes: 2 additions & 14 deletions Assets/Scripts/Gameplay/GameplayObjects/Character/ServerAnimationHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
Copy link
Contributor

@SamuelBellomo SamuelBellomo Nov 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note release note?

using System.Collections;
using Unity.BossRoom.Gameplay.Configuration;
using Unity.Netcode;
using Unity.Netcode.Components;
Expand All @@ -24,18 +23,7 @@ public override void OnNetworkSpawn()
{
if (IsServer)
{
// Wait until next frame before registering on OnValueChanged to make sure NetworkAnimator has spawned before.
StartCoroutine(WaitToRegisterOnLifeStateChanged());
}
}

IEnumerator WaitToRegisterOnLifeStateChanged()
{
yield return new WaitForEndOfFrame();
m_NetworkLifeState.LifeState.OnValueChanged += OnLifeStateChanged;
if (m_NetworkLifeState.LifeState.Value != LifeState.Alive)
{
OnLifeStateChanged(LifeState.Alive, m_NetworkLifeState.LifeState.Value);
m_NetworkLifeState.LifeState.OnValueChanged += OnLifeStateChanged;
}
}

Expand All @@ -59,7 +47,7 @@ void OnLifeStateChanged(LifeState previousValue, LifeState newValue)

public override void OnNetworkDespawn()
{
if (IsServer)
if (IsServer && m_NetworkLifeState)
{
m_NetworkLifeState.LifeState.OnValueChanged -= OnLifeStateChanged;
}
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)

Additional documentation and release notes are available at [Multiplayer Documentation](https://docs-multiplayer.unity3d.com).

## [unreleased] - yyyy-mm-dd
### Cleanup
* Removed an unneeded workaround for animation syncing on OnNetworkSpawn of ServerAnimationHandler (#783) Refactorings to NetworkAnimator have made it unnecessary to manually sync an Animator's base animation state.

## [2.2.0] - 2023-06-14

### Added
Expand Down