Fix showing speech bubble during global chat

ethanmoffat · Sep 14, 2022 · 5c0603d · 5c0603d
1 parent 6be6256
commit 5c0603d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/EOLib/Domain/Chat/ChatActions.cs b/EOLib/Domain/Chat/ChatActions.cs
@@ -94,6 +94,8 @@ public class ChatActions : IChatActions
             return (chatType switch
             {
                 ChatType.PM => ChatResult.HideSpeechBubble,
+                ChatType.Global => ChatResult.HideSpeechBubble,
+                ChatType.Admin => ChatResult.HideSpeechBubble,
                 ChatType.Announce => ChatResult.AdminAnnounce,
                 _ => ChatResult.Ok,
             }, chat);

diff --git a/EndlessClient/Controllers/ChatController.cs b/EndlessClient/Controllers/ChatController.cs
@@ -67,7 +67,7 @@ public void SendChatAndClearTextBox()
                             });
                         }
                         break;
-                    case ChatResult.AdminAnnounce: _sfxPlayer.PlaySfx(SoundEffectID.AdminAnnounceReceived); break;
+                    case ChatResult.AdminAnnounce: _sfxPlayer.PlaySfx(SoundEffectID.AdminAnnounceReceived); goto case ChatResult.Ok;
                     case ChatResult.HideSpeechBubble: break; // no-op
                     case ChatResult.HideAll: break; // no-op
                 }