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

Fix radio messages not being sent and messages not being escaped.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-05-11 12:17:47 +02:00
parent 4780179058
commit 9c3c81e8d8
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Chat/ChatManager.cs
View File

@@ -355,7 +355,7 @@ namespace Content.Client.Chat
} }
var color = Color.DarkGray; var color = Color.DarkGray;
var messageText = message.Message; var messageText = FormattedMessage.EscapeText(message.Message);
if (!string.IsNullOrEmpty(message.MessageWrap)) if (!string.IsNullOrEmpty(message.MessageWrap))
{ {
messageText = string.Format(message.MessageWrap, messageText); messageText = string.Format(message.MessageWrap, messageText);

2
Content.Server/GameObjects/Components/Headset/HeadsetComponent.cs
View File

@@ -67,7 +67,7 @@ namespace Content.Server.GameObjects.Components.Headset
msg.Channel = ChatChannel.Radio; msg.Channel = ChatChannel.Radio;
msg.Message = message; msg.Message = message;
//Square brackets are added here to avoid issues with escaping //Square brackets are added here to avoid issues with escaping
msg.MessageWrap = Loc.GetString("chat-radio-message-wrap", ("channel", $"[{channel}]"), ("name", source.Name)); msg.MessageWrap = Loc.GetString("chat-radio-message-wrap", ("channel", $"\\[{channel}\\]"), ("name", source.Name));
_netManager.ServerSendMessage(msg, playerChannel); _netManager.ServerSendMessage(msg, playerChannel);
} }
} }

4
Resources/Changelog/Parts/radio.yml Normal file
View File

@@ -0,0 +1,4 @@
author: Zumorica
changes:
- type: Fix
message: Fixes radio messages not sending.