aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2016-12-14 23:20:27 -0300
committerDoctorKraft <DoctorKraft@users.noreply.github.com>2018-03-12 16:39:42 +0100
commit6d060bbea82fcbafd319ee137cdc2bdd906ff078 (patch)
tree51a65d5a83d59ab5aa0edab8ef96cdcc6ffee7da /src
parent07ac9c0f70bf1235d4e30492ccdda74673ca5458 (diff)
Core/Chat: fix RBAC_PERM_COMMANDS_NOTIFY_COMMAND_NOT_FOUND_ERROR for subcommands
Ref #18463 (cherry picked from commit eb376f4b7eb3b2f1050a5cdb7b2086ab4b190de4)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Chat/Chat.cpp3
-rw-r--r--src/server/game/World/World.h1
2 files changed, 3 insertions, 1 deletions
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<ChatCommand> 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,