REPO: code-style clean-up
* Fixed pGuild->guild * Fixed pGroup->group * Fixed pOwner->owner
This commit is contained in:
1 parent
f1ccb83dc0
commit
96d7a1e970
18 files changed
+172
-172
No files matched your search
@@ -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);
|
||||
|
||||
Reference in new issue
Block a user