Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/src/game/Map.cpp b/src/game/Map.cpp
- index 6a267fe..6a4a5e1 100644
- --- a/src/game/Map.cpp
- +++ b/src/game/Map.cpp
- @@ -1261,9 +1261,8 @@ bool DungeonMap::CanEnter(Player *player)
- return false;
- }
- - // cannot enter while players in the instance are in combat
- - Group *pGroup = player->GetGroup();
- - if(pGroup && pGroup->InCombatToInstance(GetInstanceId()) && player->isAlive() && player->GetMapId() != GetId())
- + // cannot enter while an encounter in the instance is in progress
- + if (!player->isGameMaster() && GetInstanceData() && GetInstanceData()->IsEncounterInProgress() && player->GetMapId() != GetId())
- {
- player->SendTransferAborted(GetId(), TRANSFER_ABORT_ZONE_IN_COMBAT);
- return false;
Add Comment
Please, Sign In to add comment