From 86677e0395798b9381b02e857312ac6c6401343d Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 18 Sep 2018 19:56:34 -0400 Subject: [PATCH] Fix crashing while processing unknown chat commands --- src/Tgstation.Server.Host/Components/Chat/Chat.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Chat/Chat.cs b/src/Tgstation.Server.Host/Components/Chat/Chat.cs index e5653dc5e0..64c763c22e 100644 --- a/src/Tgstation.Server.Host/Components/Chat/Chat.cs +++ b/src/Tgstation.Server.Host/Components/Chat/Chat.cs @@ -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 { message.User.Channel.RealId }, cancellationToken).ConfigureAwait(false); - return; - } - if (commandHandler == default) { await SendMessage(UnknownCommandMessage, new List { 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 { 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 { message.User.Channel.RealId }, cancellationToken).ConfigureAwait(false);