diff options
| author | tartalo <none@none> | 2009-11-01 15:58:05 +0100 |
|---|---|---|
| committer | tartalo <none@none> | 2009-11-01 15:58:05 +0100 |
| commit | e634533f912f9f76d4c7f8210a5ffb07eb007968 (patch) | |
| tree | a14de00760818d980771ecd1da1342be7b22d8df /src | |
| parent | 218e81d4dc39a4209c3f836e36e7c1131f8a5c6f (diff) | |
Fix crash
--HG--
branch : trunk
Diffstat (limited to 'src')
| -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; |