From 6d060bbea82fcbafd319ee137cdc2bdd906ff078 Mon Sep 17 00:00:00 2001 From: ariel- Date: Wed, 14 Dec 2016 23:20:27 -0300 Subject: Core/Chat: fix RBAC_PERM_COMMANDS_NOTIFY_COMMAND_NOT_FOUND_ERROR for subcommands Ref #18463 (cherry picked from commit eb376f4b7eb3b2f1050a5cdb7b2086ab4b190de4) --- src/server/game/Chat/Chat.cpp | 3 +++ src/server/game/World/World.h | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/server') diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 59612cad196..e7aacf6c159 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -293,6 +293,9 @@ bool ChatHandler::ExecuteCommandInTable(std::vector const& table, c { if (!ExecuteCommandInTable(table[i].ChildCommands, text, fullcmd)) { + if (m_session && !m_session->HasPermission(rbac::RBAC_PERM_COMMANDS_NOTIFY_COMMAND_NOT_FOUND_ERROR)) + return false; + if (text[0] != '\0') SendSysMessage(LANG_NO_SUBCMD); else diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 748c07705ec..7b0ad97cd8c 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -101,7 +101,6 @@ enum WorldBoolConfigs { CONFIG_DURABILITY_LOSS_IN_PVP = 0, CONFIG_ADDON_CHANNEL, - CONFIG_ALLOW_PLAYER_COMMANDS, CONFIG_CLEAN_CHARACTER_DB, CONFIG_GRID_UNLOAD, CONFIG_STATS_SAVE_ONLY_ON_LOGOUT, -- cgit v1.2.3