Prevent crash when someone is emoting while logging in

ethanmoffat · May 27, 2022 · 718c2dc · 718c2dc
1 parent ceae165
commit 718c2dc
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/EndlessClient/Rendering/Character/CharacterAnimationActions.cs b/EndlessClient/Rendering/Character/CharacterAnimationActions.cs
@@ -254,7 +254,14 @@ public void NotifyMapEffect(MapEffect effect, byte strength = 0)
 
         public void NotifyEmote(short playerId, Emote emote)
         {
-            Animator.Emote(playerId, emote);
+            try
+            {
+                Animator.Emote(playerId, emote);
+            }
+            catch (InvalidOperationException)
+            {
+                // if still transitioning to in-game state, the game will crash because the in-game control set is not completely set up yet
+            }
         }
 
         public void MakeMainPlayerDrunk()