Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: sql/base/auth_database.sql sql/base/characters_database.sql src/server/game/Entities/Player/Player.cpp src/server/game/Handlers/LFGHandler.cpp src/server/game/Server/WorldSession.cpp src/server/game/Server/WorldSession.h src/server/game/Server/WorldSocket.cpp src/server/game/World/World.cpp src/server/scripts/Spells/spell_generic.cpp
This commit is contained in:
commit
12c8cdc26c
54 files changed
+3319
-518
No files matched your search
@@ -122,8 +122,27 @@ const char *ChatHandler::GetTrinityString(int32 entry) const
|
||||
|
||||
bool ChatHandler::isAvailable(ChatCommand const& cmd) const
|
||||
{
|
||||
// check security level only for simple command (without child commands)
|
||||
return m_session->GetSecurity() >= AccountTypes(cmd.SecurityLevel);
|
||||
uint32 permission = 0;
|
||||
|
||||
///@Workaround:: Fast adaptation to RBAC system till all commands are moved to permissions
|
||||
switch (AccountTypes(cmd.SecurityLevel))
|
||||
{
|
||||
case SEC_ADMINISTRATOR:
|
||||
permission = RBAC_PERM_ADMINISTRATOR_COMMANDS;
|
||||
break;
|
||||
case SEC_GAMEMASTER:
|
||||
permission = RBAC_PERM_GAMEMASTER_COMMANDS;
|
||||
break;
|
||||
case SEC_MODERATOR:
|
||||
permission = RBAC_PERM_MODERATOR_COMMANDS;
|
||||
break;
|
||||
case SEC_PLAYER:
|
||||
default:
|
||||
permission = RBAC_PERM_PLAYER_COMMANDS;
|
||||
break;
|
||||
}
|
||||
|
||||
return m_session->HasPermission(permission);
|
||||
}
|
||||
|
||||
bool ChatHandler::HasLowerSecurity(Player* target, uint64 guid, bool strong)
|
||||
@@ -431,7 +450,7 @@ bool ChatHandler::ParseCommands(char const* text)
|
||||
|
||||
std::string fullcmd = text;
|
||||
|
||||
if (m_session && AccountMgr::IsPlayerAccount(m_session->GetSecurity()) && !sWorld->getBoolConfig(CONFIG_ALLOW_PLAYER_COMMANDS))
|
||||
if (m_session && !m_session->HasPermission(RBAC_PERM_PLAYER_COMMANDS))
|
||||
return false;
|
||||
|
||||
/// chat case (.command or !command format)
|
||||
|
||||
Reference in new issue
Block a user