Merge branch 'master' into 4.3.4

Conflicts:
	src/server/game/Entities/Player/Player.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/World/World.cpp
	src/server/game/World/World.h
	src/server/scripts/Commands/cs_reload.cpp
This commit is contained in:
Spp committed 2013-02-27 04:08:19 +01:00
commit 03505a3a42
31 files changed
+402 -344

No files matched your search

+20 -3
View File
@@ -1127,11 +1127,13 @@ void WorldSession::LoadPermissions()
{
uint32 id = GetAccountId();
std::string name;
int32 realmId = ConfigMgr::GetIntDefault("RealmID", 0);
AccountMgr::GetName(id, name);
_RBACData = new RBACData(id, name, realmId);
_RBACData = new RBACData(id, name, realmID);
_RBACData->LoadFromDB();
sLog->outDebug(LOG_FILTER_RBAC, "WorldSession::LoadPermissions [AccountId: %u, Name: %s, realmId: %d]",
id, name.c_str(), realmID);
}
RBACData* WorldSession::GetRBACData()
@@ -1141,5 +1143,20 @@ RBACData* WorldSession::GetRBACData()
bool WorldSession::HasPermission(uint32 permission)
{
return _RBACData->HasPermission(permission);
if (!_RBACData)
LoadPermissions();
bool hasPermission = _RBACData->HasPermission(permission);
sLog->outDebug(LOG_FILTER_RBAC, "WorldSession::HasPermission [AccountId: %u, Name: %s, realmId: %d]",
_RBACData->GetId(), _RBACData->GetName().c_str(), realmID);
return hasPermission;
}
void WorldSession::InvalidateRBACData()
{
sLog->outDebug(LOG_FILTER_RBAC, "WorldSession::InvalidateRBACData [AccountId: %u, Name: %s, realmId: %d]",
_RBACData->GetId(), _RBACData->GetName().c_str(), realmID);
delete _RBACData;
_RBACData = NULL;
}