From 2cfdf211b8b3172c92f6fc8a9bae971770486763 Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Sun, 19 Nov 2023 00:38:01 -0500 Subject: [PATCH] Fix `ChatManager` `NullReferenceException` --- .../Components/Chat/ChatManager.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs b/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs index fb1b617625..6f85282cf3 100644 --- a/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs +++ b/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs @@ -843,9 +843,12 @@ namespace Tgstation.Server.Host.Components.Chat } else { - var (helpHandler, _) = GetCommand(); - if (helpHandler != default) + var helpTuple = GetCommand(); + if (helpTuple != default) + { + var (helpHandler, _) = helpTuple; helpText = String.Format(CultureInfo.InvariantCulture, "{0}: {1}{2}", helpHandler.Name, helpHandler.HelpText, helpHandler.AdminOnly ? " - May only be used in admin channels" : String.Empty); + } else helpText = UnknownCommandMessage; } @@ -854,14 +857,16 @@ namespace Tgstation.Server.Host.Components.Chat return; } - var (commandHandler, trackingContext) = GetCommand(); + var tuple = GetCommand(); - if (commandHandler == default) + if (tuple == default) { await TextReply(UnknownCommandMessage); return; } + var (commandHandler, trackingContext) = tuple; + if (trackingContext?.Active == false) { await TextReply("TGS: The server is rebooting, please try again later");