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

Fix incorrectly ported emote sanitization (#7370)

Browse Source
This commit is contained in:
mirrorcult
2022-04-01 00:08:26 -07:00
committed by GitHub
parent 3005777ef9
commit 634cf59527
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Server/Chat/ChatSystem.cs
View File

@@ -82,22 +82,21 @@ public sealed class ChatSystem : EntitySystem
return; return;
} }
// Sus
if (player?.AttachedEntity is { Valid: true } entity && source != entity)
{
return;
}
if (!CanSendInGame(message, shell, player)) if (!CanSendInGame(message, shell, player))
return; return;
message = SanitizeInGameICMessage(source, message, out var emoteStr); message = SanitizeInGameICMessage(source, message, out var emoteStr);
// Is this -actually- an emote, and is a player sending it? // Was there an emote in the message? If so, send it.
if (player != null && emoteStr != message && emoteStr != null) if (player != null && emoteStr != message && emoteStr != null)
{ {
SendEntityEmote(source, emoteStr, hideChat); SendEntityEmote(source, emoteStr, hideChat);
return;
}
// Sus
if (player?.AttachedEntity is { Valid: true } entity && source != entity)
{
return;
} }
// Otherwise, send whatever type. // Otherwise, send whatever type.