Fix crash

--HG--
branch : trunk
This commit is contained in:
tartalo
2009-11-01 15:58:05 +01:00
parent 218e81d4dc
commit e634533f91
+1 -1
View File
@@ -2524,7 +2524,7 @@ bool InstanceMap::CanEnter(Player *player)
// cannot enter while an encounter is in progress on raids // cannot enter while an encounter is in progress on raids
/*Group *pGroup = player->GetGroup(); /*Group *pGroup = player->GetGroup();
if(!player->isGameMaster() && pGroup && pGroup->InCombatToInstance(GetInstanceId()) && player->GetMapId() != GetId())*/ 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); player->SendTransferAborted(GetId(), TRANSFER_ABORT_ZONE_IN_COMBAT);
return false; return false;