Fix level up emote not displaying while attacking/casting

ethanmoffat · Sep 14, 2022 · 2881351 · 2881351
1 parent 6a4a127
commit 2881351
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/EndlessClient/Rendering/Character/CharacterAnimationActions.cs b/EndlessClient/Rendering/Character/CharacterAnimationActions.cs
@@ -302,6 +302,16 @@ public void NotifyMapEffect(MapEffect effect, byte strength = 0)
 
         public void NotifyEmote(short playerId, Emote emote)
         {
+            switch (emote)
+            {
+                case EOLib.Domain.Character.Emote.Trade:
+                    _sfxPlayer.PlaySfx(SoundEffectID.TradeAccepted);
+                    break;
+                case EOLib.Domain.Character.Emote.LevelUp:
+                    _sfxPlayer.PlaySfx(SoundEffectID.LevelUp);
+                    break;
+            }
+
             try
             {
                 Animator.Emote(playerId, emote);

diff --git a/EndlessClient/Rendering/Character/CharacterAnimator.cs b/EndlessClient/Rendering/Character/CharacterAnimator.cs
@@ -206,9 +206,9 @@ public void StartOtherCharacterSpellCast(int characterID)
 
         public bool Emote(int characterID, Emote whichEmote)
         {
-            if (_otherPlayerStartWalkingTimes.ContainsKey(characterID) ||
+            if (((_otherPlayerStartWalkingTimes.ContainsKey(characterID) ||
                 _otherPlayerStartAttackingTimes.ContainsKey(characterID) ||
-                _otherPlayerStartSpellCastTimes.ContainsKey(characterID) ||
+                _otherPlayerStartSpellCastTimes.ContainsKey(characterID)) && whichEmote != EOLib.Domain.Character.Emote.LevelUp) ||
                 _startEmoteTimes.ContainsKey(characterID))
                 return false;