diff options
| author | Blaymoira <none@none> | 2009-02-13 23:53:06 +0100 |
|---|---|---|
| committer | Blaymoira <none@none> | 2009-02-13 23:53:06 +0100 |
| commit | 29f3d67fb8d47ea25291fa040f1cfd33b53c9da6 (patch) | |
| tree | 6cd473f8fff6f083d3a8b1cafdf47c943fefe69d /src/game/Group.cpp | |
| parent | ffb5fb7445e7766c6eca0b4b2c4d254a89d91d0e (diff) | |
*Prevent entering in instances if zone in combat - by Iskander
--HG--
branch : trunk
Diffstat (limited to 'src/game/Group.cpp')
| -rw-r--r-- | src/game/Group.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/game/Group.cpp b/src/game/Group.cpp index 829538f8af7..908a610e7a2 100644 --- a/src/game/Group.cpp +++ b/src/game/Group.cpp @@ -1389,8 +1389,10 @@ bool Group::InCombatToInstance(uint32 instanceId) for(GroupReference *itr = GetFirstMember(); itr != NULL; itr = itr->next()) { Player *pPlayer = itr->getSource(); - if(pPlayer->getAttackers().size() && pPlayer->GetInstanceId() == instanceId) - return true; + if(pPlayer && pPlayer->getAttackers().size() && pPlayer->GetInstanceId() == instanceId && (pPlayer->GetMap()->IsRaid() || pPlayer->GetMap()->IsHeroic())) + for(std::set<Unit*>::const_iterator i = pPlayer->getAttackers().begin(); i!=pPlayer->getAttackers().end(); ++i) + if((*i) && (*i)->GetTypeId() == TYPEID_UNIT && ((Creature*)(*i))->GetCreatureInfo()->flags_extra & CREATURE_FLAG_EXTRA_INSTANCE_BIND) + return true; } return false; } |