diff options
| author | Shocker <shocker@freakz.ro> | 2011-10-07 09:19:37 -0700 |
|---|---|---|
| committer | Shocker <shocker@freakz.ro> | 2011-10-07 09:19:37 -0700 |
| commit | ac01eaa4e46334e43c2e582414867394a48dd770 (patch) | |
| tree | 048c3d98dd7f758ab022c3445b310cd256105997 /src/server/game/Maps/Map.cpp | |
| parent | e23fe1845fbe876f2ce50ebd25e3b135e5c2f1e2 (diff) | |
| parent | 81c0a3a8479fef8ea52e1af19174bd777a5759e3 (diff) | |
Merge pull request #3391 from Bootz/master
Code-Stlye clean-ups
Diffstat (limited to 'src/server/game/Maps/Map.cpp')
| -rwxr-xr-x | src/server/game/Maps/Map.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index e122c5bffae..b283227bb58 100755 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -2240,8 +2240,8 @@ 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())*/ + /*Group* group = player->GetGroup(); + if (!player->isGameMaster() && group && group->InCombatToInstance(GetInstanceId()) && player->GetMapId() != GetId())*/ if (IsRaid() && GetInstanceScript() && GetInstanceScript()->IsEncounterInProgress()) { player->SendTransferAborted(GetId(), TRANSFER_ABORT_ZONE_IN_COMBAT); |