Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 10:56:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash

Browse Source 
--HG--
branch : trunk
This commit is contained in:
tartalo
2009-11-01 15:58:05 +01:00
parent 218e81d4dc
commit e634533f91
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/Map.cpp
View File

@@ -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;