From 394f125fdc158a37b46dcb4343a8266d141ec2c7 Mon Sep 17 00:00:00 2001 From: CraftedRO <24683355+CraftedRO@users.noreply.github.com> Date: Mon, 15 Jul 2024 14:31:16 +0300 Subject: Core/Instances: Fix not being able to resurect at the instance entrance under certain conditions --- src/server/game/Maps/MapManager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/server/game/Maps/MapManager.cpp b/src/server/game/Maps/MapManager.cpp index 7f83cb1c054..b2e42a91bb8 100644 --- a/src/server/game/Maps/MapManager.cpp +++ b/src/server/game/Maps/MapManager.cpp @@ -152,10 +152,6 @@ 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[player->GetSession()->GetSessionDbcLocale()]; Group* group = player->GetGroup(); @@ -209,6 +205,10 @@ 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::CANNOT_ENTER_UNSPECIFIED_REASON; + return Map::CAN_ENTER; } -- cgit v1.2.3