cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-29 08:00:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #677 from Cyberboss/FixChat

Browse Source 
Fix crashing while processing unknown chat commands
This commit is contained in:
Jordan Brown
2018-09-18 23:51:35 -04:00
committed by GitHub
parent 6f00e2a2ec 86677e0395
commit ebe0b859d3
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Chat/Chat.cs
+6 -6
View File
@@ -269,18 +269,18 @@ namespace Tgstation.Server.Host.Components.Chat
var commandHandler = await GetCommand(command).ConfigureAwait(false);
if (commandHandler.AdminOnly && !message.User.Channel.IsAdmin)
{
await SendMessage("Use this command in an admin channel!", new List<ulong> { message.User.Channel.RealId }, cancellationToken).ConfigureAwait(false);
return;
}
if (commandHandler == default)
{
await SendMessage(UnknownCommandMessage, new List<ulong> { message.User.Channel.RealId }, cancellationToken).ConfigureAwait(false);
return;
}
if (commandHandler.AdminOnly && !message.User.Channel.IsAdmin)
{
await SendMessage("Use this command in an admin channel!", new List<ulong> { message.User.Channel.RealId }, cancellationToken).ConfigureAwait(false);
return;
}
var result = await commandHandler.Invoke(arguments, message.User, cancellationToken).ConfigureAwait(false);
if (result != null)
await SendMessage(result, new List<ulong> { message.User.Channel.RealId }, cancellationToken).ConfigureAwait(false);