Skip to content

Commit 40d2f89

Browse files
Merge develop into feature/replace-guid-with-auth-playerid
2 parents 8975d19 + f346969 commit 40d2f89

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,22 @@ public class ServerAnimationHandler : NetworkBehaviour
1111
NetworkAnimator m_NetworkAnimator;
1212

1313
[SerializeField]
14-
private VisualizationConfiguration m_VisualizationConfiguration;
14+
VisualizationConfiguration m_VisualizationConfiguration;
1515

1616
[SerializeField]
1717
NetworkLifeState m_NetworkLifeState;
1818

19-
public NetworkAnimator NetworkAnimator
20-
{
21-
get => m_NetworkAnimator;
22-
set => m_NetworkAnimator = value;
23-
}
19+
public NetworkAnimator NetworkAnimator => m_NetworkAnimator;
2420

2521
public override void OnNetworkSpawn()
2622
{
27-
m_NetworkLifeState.LifeState.OnValueChanged += OnLifeStateChanged;
23+
if (IsServer)
24+
{
25+
m_NetworkLifeState.LifeState.OnValueChanged += OnLifeStateChanged;
26+
}
2827
}
2928

30-
private void OnLifeStateChanged(LifeState previousValue, LifeState newValue)
29+
void OnLifeStateChanged(LifeState previousValue, LifeState newValue)
3130
{
3231
switch (newValue)
3332
{
@@ -47,7 +46,10 @@ private void OnLifeStateChanged(LifeState previousValue, LifeState newValue)
4746

4847
public override void OnNetworkDespawn()
4948
{
50-
m_NetworkLifeState.LifeState.OnValueChanged -= OnLifeStateChanged;
49+
if (IsServer)
50+
{
51+
m_NetworkLifeState.LifeState.OnValueChanged -= OnLifeStateChanged;
52+
}
5153
}
5254
}
5355
}

0 commit comments

Comments
 (0)