diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-07 23:40:37 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-07 23:40:37 +0200 |
| commit | 1f62d9c3875c446e3b8a23f8624c3ee8d8eb80cc (patch) | |
| tree | d450c68ac6e085359b5a22e32912dc03c0743206 /src/server/game/Maps/Map.cpp | |
| parent | 1e4ec81ccbc4e471804f9067d1cd18268d84e707 (diff) | |
| parent | 5fee5b012566191bfd0c27d3fcfc64aad6d657cb (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Handlers/ItemHandler.cpp
src/server/scripts/Spells/spell_dk.cpp
Diffstat (limited to 'src/server/game/Maps/Map.cpp')
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 22c0b332f33..cd91af11a92 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -2859,10 +2859,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; |