Core/Maps: Allow logging players to enter in instances that have an encounter in progress

This commit is contained in:
Trisjdc committed 2014-06-03 00:57:36 +01:00
1 parent 409a19e623
commit 18868f5cbd
3 files changed
+10 -4

No files matched your search

+3 -4
View File
@@ -2854,10 +2854,9 @@ bool InstanceMap::CanEnter(Player* player)
return false;
}
// cannot enter while an encounter is in progress on raids
/*Group* group = player->GetGroup();
if (!player->IsGameMaster() && group && group->InCombatToInstance(GetInstanceId()) && player->GetMapId() != GetId())*/
if (IsRaid() && GetInstanceScript() && GetInstanceScript()->IsEncounterInProgress())
// cannot enter while an encounter is in progress
// allow if just loading
if (!player->IsLoading() && IsRaid() && GetInstanceScript() && GetInstanceScript()->IsEncounterInProgress())
{
player->SendTransferAborted(GetId(), TRANSFER_ABORT_ZONE_IN_COMBAT);
return false;