aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Maps/MapManager.cpp
diff options
context:
space:
mode:
authorCraftedRO <24683355+CraftedRO@users.noreply.github.com>2024-07-15 14:31:16 +0300
committerGitHub <noreply@github.com>2024-07-15 13:31:16 +0200
commit394f125fdc158a37b46dcb4343a8266d141ec2c7 (patch)
treeaf13f752c9b5d06a1251d497e59e0831e9a9a605 /src/server/game/Maps/MapManager.cpp
parenta3aecbdd92000c3338aa14ecfcd3aaca91d99391 (diff)
Core/Instances: Fix not being able to resurect at the instance entrance under certain conditions
Diffstat (limited to 'src/server/game/Maps/MapManager.cpp')
-rw-r--r--src/server/game/Maps/MapManager.cpp8
1 files changed, 4 insertions, 4 deletions
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;
}