diff options
author | Treeston <treeston.mmoc@gmail.com> | 2020-09-20 03:31:54 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2022-02-27 20:59:19 +0100 |
commit | 46d4e2fa8378eed414c07eb161a19b772c474735 (patch) | |
tree | d075a9e3b907399fd4216a2f03e020959c4301a6 /src/server/game | |
parent | 3fd2eb126cbed36292fa5defc024c2b93e8d8671 (diff) |
1eca51b follow-up, nuke `command`.`permission` from orbit; it was only duplicating data already stored in the core.
(cherry picked from commit 991dc8e050777b5e33ff22b008ab2125bae22437)
Diffstat (limited to 'src/server/game')
-rw-r--r-- | src/server/game/Accounts/RBAC.h | 2 | ||||
-rw-r--r-- | src/server/game/Chat/ChatCommands/ChatCommand.cpp | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/src/server/game/Accounts/RBAC.h b/src/server/game/Accounts/RBAC.h index 408da2515dc..22250b95c50 100644 --- a/src/server/game/Accounts/RBAC.h +++ b/src/server/game/Accounts/RBAC.h @@ -497,7 +497,7 @@ enum RBACPermissions RBAC_PERM_COMMAND_RELOAD_AREATRIGGER_TELEPORT = 625, RBAC_PERM_COMMAND_RELOAD_AUCTIONS = 626, RBAC_PERM_COMMAND_RELOAD_AUTOBROADCAST = 627, - RBAC_PERM_COMMAND_RELOAD_COMMAND = 628, + // 628 previously used, do not reuse RBAC_PERM_COMMAND_RELOAD_CONDITIONS = 629, RBAC_PERM_COMMAND_RELOAD_CONFIG = 630, RBAC_PERM_COMMAND_RELOAD_BATTLEGROUND_TEMPLATE = 631, 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<rbac::RBACPermissions>(permission); - } - cmd->_help.assign(help); } while (result->NextRow()); } |