epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5817 from Mailaender/chat-command-nre

Browse Source 
Fixed chat commands crashing replays
This commit is contained in:
obrakmann
2014-07-04 21:57:12 +02:00
parent 0572220cc3 13e0dac141
commit 6d3edb8725
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.RA/Widgets/Logic/IngameChatLogic.cs
View File

@@ -67,7 +67,11 @@ namespace OpenRA.Mods.RA.Widgets.Logic
{
var team = teamChat && !disableTeamChat;
if (chatText.Text != "")
orderManager.IssueOrder(Order.Chat(team, chatText.Text.Trim()));
if (!chatText.Text.StartsWith("/"))
orderManager.IssueOrder(Order.Chat(team, chatText.Text.Trim()));
else
if (chatTraits != null)
chatTraits.All(x => x.OnChat(orderManager.LocalClient.Name, chatText.Text.Trim()));
CloseChat();
return true;
@@ -126,9 +130,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic
public void AddChatLine(Color c, string from, string text)
{
if (chatTraits != null && !chatTraits.All(x => x.OnChat(from, text)))
return;
chatOverlayDisplay.AddLine(c, from, text);
var template = chatTemplate.Clone();