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

Fix radio/chat error (#9264)

Browse Source
This commit is contained in:
Leon Friedrich
2022-06-29 15:13:01 +12:00
committed by GitHub
parent 8df89bd055
commit bb04646bbe
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -231,6 +231,8 @@ public sealed partial class ChatSystem : SharedChatSystem
var (message, channel) = GetRadioPrefix(source, originalMessage); var (message, channel) = GetRadioPrefix(source, originalMessage);
message = TransformSpeech(source, message); message = TransformSpeech(source, message);
if (message.Length == 0)
return;
if (channel != null) if (channel != null)
_listener.PingListeners(source, message, channel); _listener.PingListeners(source, message, channel);
@@ -249,11 +251,14 @@ public sealed partial class ChatSystem : SharedChatSystem
_adminLogger.Add(LogType.Chat, LogImpact.Low, $"Say from {ToPrettyString(source):user}, original: {originalMessage}, transformed: {message}."); _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Say from {ToPrettyString(source):user}, original: {originalMessage}, transformed: {message}.");
} }
private void SendEntityWhisper(EntityUid source, string message, bool hideChat = false) private void SendEntityWhisper(EntityUid source, string originalMessage, bool hideChat = false)
{ {
if (!_actionBlocker.CanSpeak(source)) return; if (!_actionBlocker.CanSpeak(source)) return;
message = TransformSpeech(source, message); var message = TransformSpeech(source, originalMessage);
if (message.Length == 0)
return;
var obfuscatedMessage = ObfuscateMessageReadability(message, 0.2f); var obfuscatedMessage = ObfuscateMessageReadability(message, 0.2f);
var transformSource = Transform(source); var transformSource = Transform(source);
@@ -289,7 +294,11 @@ public sealed partial class ChatSystem : SharedChatSystem
var ev = new EntitySpokeEvent(message); var ev = new EntitySpokeEvent(message);
RaiseLocalEvent(source, ev, false); RaiseLocalEvent(source, ev, false);
_adminLogger.Add(LogType.Chat, LogImpact.Low, $"Whisper from {ToPrettyString(source):user}: {message}");
if (originalMessage == message)
_adminLogger.Add(LogType.Chat, LogImpact.Low, $"Whisper from {ToPrettyString(source):user}: {originalMessage}.");
else
_adminLogger.Add(LogType.Chat, LogImpact.Low, $"Whisper from {ToPrettyString(source):user}, original: {originalMessage}, transformed: {message}.");
} }
private void SendEntityEmote(EntityUid source, string action, bool hideChat) private void SendEntityEmote(EntityUid source, string action, bool hideChat)