From 70cd58765e2e78a691de6b2adf82418bd1e208f8 Mon Sep 17 00:00:00 2001 From: Jozef Dúc Date: Sun, 17 Mar 2019 19:52:46 +0100 Subject: Check player conditions to enter instance (#23117) Check player conditions to enter before party condition. (cherry picked from commit 62f621fcd7e03df62a2af1dc295dc7ec1fc28d77) --- src/server/game/Maps/MapManager.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp index 89136a72481..6b2e376b2dd 100644 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapManager.cpp @@ -174,6 +174,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->MapName[sWorld->GetDefaultDbcLocale()]; Group* group = player->GetGroup(); @@ -227,11 +231,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) -- cgit v1.2.3