Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check player conditions to enter instance (#23117)

Browse Source 
Check player conditions to enter before party condition.
This commit is contained in:
Jozef Dúc
2019-03-17 19:52:46 +01:00
committed by Giacomo Pozzoni
parent c76931c2c0
commit 62f621fcd7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/game/Maps/MapManager.cpp
View File

@@ -148,6 +148,10 @@ Map::EnterState MapManager::PlayerCannotEnter(uint32 mapid, Player* player, bool
if (player->IsGameMaster())
return Map::CAN_ENTER;
//Other requirements
if (!player->Satisfy(sObjectMgr->GetAccessRequirement(mapid, targetDifficulty), mapid, true))
return Map::CANNOT_ENTER_UNSPECIFIED_REASON;
char const* mapName = entry->name[player->GetSession()->GetSessionDbcLocale()];
Group* group = player->GetGroup();
@@ -201,11 +205,7 @@ Map::EnterState MapManager::PlayerCannotEnter(uint32 mapid, Player* player, bool
return Map::CANNOT_ENTER_TOO_MANY_INSTANCES;
}
//Other requirements
if (player->Satisfy(sObjectMgr->GetAccessRequirement(mapid, targetDifficulty), mapid, true))
return Map::CAN_ENTER;
else
return Map::CANNOT_ENTER_UNSPECIFIED_REASON;
return Map::CAN_ENTER;
}
void MapManager::Update(uint32 diff)