Merge remote-tracking branch 'sgk/general-devel' into general-devel

This commit is contained in:
Lucas Nicodemus 2022-10-31 15:33:36 -07:00
commit 46001c5be1
No known key found for this signature in database
2 changed files with 7 additions and 1 deletions

View file

@ -684,7 +684,10 @@ namespace TShockAPI
{
if (!cmd.CanRun(player))
{
TShock.Utils.SendLogs(GetString("{0} tried to execute {1}{2}.", player.Name, Specifier, cmdText), Color.PaleVioletRed, player);
if (cmd.DoLog)
TShock.Utils.SendLogs(GetString("{0} tried to execute {1}{2}.", player.Name, Specifier, cmdText), Color.PaleVioletRed, player);
else
TShock.Utils.SendLogs(GetString("{0} tried to execute (args omitted) {1}{2}.", player.Name, Specifier, cmdName), Color.PaleVioletRed, player);
player.SendErrorMessage(GetString("You do not have access to this command."));
if (player.HasPermission(Permissions.su))
{
@ -699,6 +702,8 @@ namespace TShockAPI
{
if (cmd.DoLog)
TShock.Utils.SendLogs(GetString("{0} executed: {1}{2}.", player.Name, silent ? SilentSpecifier : Specifier, cmdText), Color.PaleVioletRed, player);
else
TShock.Utils.SendLogs(GetString("{0} executed (args omitted): {1}{2}.", player.Name, silent ? SilentSpecifier : Specifier, cmdName), Color.PaleVioletRed, player);
cmd.Run(cmdText, silent, player, args);
}
}