tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix glorfcode again (#22420)

Browse Source
This commit is contained in:
KP
2023-12-12 13:57:54 -08:00
committed by GitHub
parent 84fedaee13
commit 17270bb321
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
View File

@@ -707,17 +707,24 @@ public sealed class ChatUIController : UIController
private void OnDamageForceSay(DamageForceSayEvent ev, EntitySessionEventArgs _) private void OnDamageForceSay(DamageForceSayEvent ev, EntitySessionEventArgs _)
{ {
var chatBox = UIManager.ActiveScreen?.GetWidget<ChatBox>() ?? UIManager.ActiveScreen?.GetWidget<ResizableChatBox>(); var chatBox = UIManager.ActiveScreen?.GetWidget<ChatBox>() ?? UIManager.ActiveScreen?.GetWidget<ResizableChatBox>();
if (chatBox == null)
return;
var msg = chatBox.ChatInput.Input.Text.TrimEnd();
// Don't send on OOC/LOOC obviously! // Don't send on OOC/LOOC obviously!
if (chatBox?.SelectedChannel is not (ChatSelectChannel.Local or if (SplitInputContents(msg).chatChannel
ChatSelectChannel.Radio or is not (
ChatSelectChannel.Whisper)) ChatSelectChannel.Local or
ChatSelectChannel.Radio or
ChatSelectChannel.Whisper
)
)
return; return;
if (_player.LocalSession?.AttachedEntity is not { } ent if (_player.LocalSession?.AttachedEntity is not { } ent
|| !EntityManager.TryGetComponent<DamageForceSayComponent>(ent, out var forceSay)) || !EntityManager.TryGetComponent<DamageForceSayComponent>(ent, out var forceSay))
return; return;
var msg = chatBox.ChatInput.Input.Text.TrimEnd();
if (string.IsNullOrWhiteSpace(msg)) if (string.IsNullOrWhiteSpace(msg))
return; return;