diff options
| author | Bootz <Stage6Dev@EMPulseGaming.com> | 2011-10-07 10:54:53 -0500 |
|---|---|---|
| committer | Bootz <Stage6Dev@EMPulseGaming.com> | 2011-10-07 10:54:53 -0500 |
| commit | 96d7a1e9704d8bdf55e2197ce26adbefb0a84e61 (patch) | |
| tree | dc9ea2734c64e5fea39912b63369f1b5544ca735 /src/server/game/Maps/Map.cpp | |
| parent | f1ccb83dc07c0036f832d38e7988816719ada43c (diff) | |
REPO: code-style clean-up
* Fixed pGuild->guild
* Fixed pGroup->group
* Fixed pOwner->owner
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); |