Merge branch 'master' into 4.3.4
Conflicts: src/server/scripts/Kalimdor/zone_durotar.cpp
This commit is contained in:
commit
f7c7f0f0f6
39 files changed
+248
-149
No files matched your search
@@ -137,9 +137,10 @@ bool ChatHandler::isAvailable(ChatCommand const& cmd) const
|
||||
permission = RBAC_PERM_MODERATOR_COMMANDS;
|
||||
break;
|
||||
case SEC_PLAYER:
|
||||
default:
|
||||
permission = RBAC_PERM_PLAYER_COMMANDS;
|
||||
break;
|
||||
default: // Allow custom security levels for commands
|
||||
return m_session->GetSecurity() >= AccountTypes(cmd.SecurityLevel);
|
||||
}
|
||||
|
||||
return m_session->HasPermission(permission);
|
||||
|
||||
Reference in new issue
Block a user