diff options
Diffstat (limited to 'src/game/Map.cpp')
| -rw-r--r-- | src/game/Map.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp index 4b2c4d0486e..0093066bd1f 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -2524,7 +2524,7 @@ bool InstanceMap::CanEnter(Player *player) // cannot enter while an encounter is in progress on raids /*Group *pGroup = player->GetGroup(); if(!player->isGameMaster() && pGroup && pGroup->InCombatToInstance(GetInstanceId()) && player->GetMapId() != GetId())*/ - if (IsRaid() && GetInstanceData()->IsEncounterInProgress()) + if (IsRaid() && GetInstanceData() && GetInstanceData()->IsEncounterInProgress()) { player->SendTransferAborted(GetId(), TRANSFER_ABORT_ZONE_IN_COMBAT); return false; |