From 46d4e2fa8378eed414c07eb161a19b772c474735 Mon Sep 17 00:00:00 2001 From: Treeston Date: Sun, 20 Sep 2020 03:31:54 +0200 Subject: 1eca51b follow-up, nuke `command`.`permission` from orbit; it was only duplicating data already stored in the core. (cherry picked from commit 991dc8e050777b5e33ff22b008ab2125bae22437) --- src/server/game/Chat/ChatCommands/ChatCommand.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/server/game/Chat/ChatCommands') diff --git a/src/server/game/Chat/ChatCommands/ChatCommand.cpp b/src/server/game/Chat/ChatCommands/ChatCommand.cpp index 865979999d7..e0f997b71ee 100644 --- a/src/server/game/Chat/ChatCommands/ChatCommand.cpp +++ b/src/server/game/Chat/ChatCommands/ChatCommand.cpp @@ -80,8 +80,7 @@ static ChatSubCommandMap COMMAND_MAP; { Field* fields = result->Fetch(); std::string_view const name = fields[0].GetStringView(); - uint16 const permission = fields[1].GetUInt16(); - std::string_view const help = fields[2].GetStringView(); + std::string_view const help = fields[1].GetStringView(); ChatCommandNode* cmd = nullptr; ChatSubCommandMap* map = &COMMAND_MAP; @@ -104,14 +103,6 @@ static ChatSubCommandMap COMMAND_MAP; if (!cmd) continue; - if (cmd->_invoker && (cmd->_permission.RequiredPermission != permission)) - { - TC_LOG_WARN("sql.sql", "Table `command` has permission %u for '" STRING_VIEW_FMT "' which does not match the core (%u). Overriding.", - permission, STRING_VIEW_FMT_ARG(name), cmd->_permission.RequiredPermission); - - cmd->_permission.RequiredPermission = static_cast(permission); - } - cmd->_help.assign(help); } while (result->NextRow()); } -- cgit v1.2.3