Fix ChatManager NullReferenceException

This commit is contained in:
Jordan Dominion
2023-11-19 08:59:07 -05:00
parent 54ec0a7c98
commit 2cfdf211b8
@@ -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");