fix(Core/ObjectGuid): prevent creating copies when looping objects (#6852)

This commit is contained in:
Francesco Borzì
2021-07-10 15:54:16 +02:00
committed by GitHub
parent 2fcafa5f39
commit 4103fca5a4
40 changed files with 69 additions and 69 deletions

View File

@@ -265,7 +265,7 @@ void PetAI::UpdateAI(uint32 diff)
// No enemy, check friendly // No enemy, check friendly
if (!spellUsed) if (!spellUsed)
{ {
for (ObjectGuid const guid : m_AllySet) for (ObjectGuid const& guid : m_AllySet)
{ {
Unit* ally = ObjectAccessor::GetUnit(*me, guid); Unit* ally = ObjectAccessor::GetUnit(*me, guid);

View File

@@ -328,7 +328,7 @@ inline void Battleground::_ProcessResurrect(uint32 diff)
for (std::map<ObjectGuid, GuidVector>::iterator itr = m_ReviveQueue.begin(); itr != m_ReviveQueue.end(); ++itr) for (std::map<ObjectGuid, GuidVector>::iterator itr = m_ReviveQueue.begin(); itr != m_ReviveQueue.end(); ++itr)
{ {
Creature* sh = nullptr; Creature* sh = nullptr;
for (ObjectGuid const guid : itr->second) for (ObjectGuid const& guid : itr->second)
{ {
Player* player = ObjectAccessor::FindPlayer(guid); Player* player = ObjectAccessor::FindPlayer(guid);
if (!player) if (!player)
@@ -360,7 +360,7 @@ inline void Battleground::_ProcessResurrect(uint32 diff)
} }
else if (m_LastResurrectTime > 500) // Resurrect players only half a second later, to see spirit heal effect on NPC else if (m_LastResurrectTime > 500) // Resurrect players only half a second later, to see spirit heal effect on NPC
{ {
for (ObjectGuid const guid : m_ResurrectQueue) for (ObjectGuid const& guid : m_ResurrectQueue)
{ {
Player* player = ObjectAccessor::FindPlayer(guid); Player* player = ObjectAccessor::FindPlayer(guid);
if (!player) if (!player)
@@ -1479,7 +1479,7 @@ void Battleground::RelocateDeadPlayers(ObjectGuid queueIndex)
if (!ghostList.empty()) if (!ghostList.empty())
{ {
GraveyardStruct const* closestGrave = nullptr; GraveyardStruct const* closestGrave = nullptr;
for (ObjectGuid const guid : ghostList) for (ObjectGuid const& guid : ghostList)
{ {
Player* player = ObjectAccessor::FindPlayer(guid); Player* player = ObjectAccessor::FindPlayer(guid);
if (!player) if (!player)

View File

@@ -897,7 +897,7 @@ void BattlegroundSA::CaptureGraveyard(BG_SA_Graveyards i, Player* Source)
if (!ghost_list.empty()) if (!ghost_list.empty())
{ {
GraveyardStruct const* ClosestGrave = nullptr; GraveyardStruct const* ClosestGrave = nullptr;
for (ObjectGuid const guid : ghost_list) for (ObjectGuid const& guid : ghost_list)
{ {
Player* player = ObjectAccessor::FindPlayer(guid); Player* player = ObjectAccessor::FindPlayer(guid);
if (!player) if (!player)

View File

@@ -1129,7 +1129,7 @@ namespace lfg
if (!deletedGroupsToErase.empty()) if (!deletedGroupsToErase.empty())
{ {
for (ObjectGuid const toErase : deletedGroupsToErase) for (ObjectGuid const& toErase : deletedGroupsToErase)
{ {
deletedGroups.erase(toErase); deletedGroups.erase(toErase);
} }
@@ -1137,7 +1137,7 @@ namespace lfg
if (!deletedGroups.empty()) if (!deletedGroups.empty())
{ {
for (ObjectGuid const deletedGroup : deletedGroups) for (ObjectGuid const& deletedGroup : deletedGroups)
{ {
++deletedCounter; ++deletedCounter;
buffer_deleted << deletedGroup; buffer_deleted << deletedGroup;

View File

@@ -212,7 +212,7 @@ void GameObject::ClearRitualList()
if (!animSpell || m_unique_users.empty()) if (!animSpell || m_unique_users.empty())
return; return;
for (ObjectGuid const guid : m_unique_users) for (ObjectGuid const& guid : m_unique_users)
{ {
if (Player* channeler = ObjectAccessor::GetPlayer(*this, guid)) if (Player* channeler = ObjectAccessor::GetPlayer(*this, guid))
if (Spell* spell = channeler->GetCurrentSpell(CURRENT_CHANNELED_SPELL)) if (Spell* spell = channeler->GetCurrentSpell(CURRENT_CHANNELED_SPELL))

View File

@@ -843,7 +843,7 @@ public:
void AddToSkillupList(ObjectGuid playerGuid) { m_SkillupList.push_back(playerGuid); } void AddToSkillupList(ObjectGuid playerGuid) { m_SkillupList.push_back(playerGuid); }
[[nodiscard]] bool IsInSkillupList(ObjectGuid playerGuid) const [[nodiscard]] bool IsInSkillupList(ObjectGuid playerGuid) const
{ {
for (ObjectGuid const guid : m_SkillupList) for (ObjectGuid const& guid : m_SkillupList)
if (guid == playerGuid) if (guid == playerGuid)
return true; return true;

View File

@@ -104,7 +104,7 @@ bool UpdateData::BuildPacket(WorldPacket* packet)
buf << (uint8) UPDATETYPE_OUT_OF_RANGE_OBJECTS; buf << (uint8) UPDATETYPE_OUT_OF_RANGE_OBJECTS;
buf << (uint32) m_outOfRangeGUIDs.size(); buf << (uint32) m_outOfRangeGUIDs.size();
for (ObjectGuid const guid : m_outOfRangeGUIDs) for (ObjectGuid const& guid : m_outOfRangeGUIDs)
{ {
buf << guid.WriteAsPacked(); buf << guid.WriteAsPacked();
} }

View File

@@ -784,7 +784,7 @@ void PoolMgr::LoadFromDB()
// Now check for circular reference // Now check for circular reference
// All pool_ids are in pool_template // All pool_ids are in pool_template
for (auto const it : mPoolTemplate) for (auto const& it : mPoolTemplate)
{ {
std::set<uint32> checkedPools; std::set<uint32> checkedPools;
for (SearchMap::iterator poolItr = mPoolSearchMap.find(it.first); poolItr != mPoolSearchMap.end(); poolItr = mPoolSearchMap.find(poolItr->second)) for (SearchMap::iterator poolItr = mPoolSearchMap.find(it.first); poolItr != mPoolSearchMap.end(); poolItr = mPoolSearchMap.find(poolItr->second))

View File

@@ -169,7 +169,7 @@ public:
case DATA_RAZORGORE_THE_UNTAMED: case DATA_RAZORGORE_THE_UNTAMED:
if (state == DONE) if (state == DONE)
{ {
for (ObjectGuid const guid : EggList) for (ObjectGuid const& guid : EggList)
if (GameObject* egg = instance->GetGameObject(guid)) if (GameObject* egg = instance->GetGameObject(guid))
egg->SetPhaseMask(2, true); egg->SetPhaseMask(2, true);
} }

View File

@@ -96,7 +96,7 @@ public:
} }
break; break;
case DATA_ERANIKUS_FIGHT: case DATA_ERANIKUS_FIGHT:
for (ObjectGuid const guid : _dragonkinList) for (ObjectGuid const& guid : _dragonkinList)
{ {
if (Creature* creature = instance->GetCreature(guid)) if (Creature* creature = instance->GetCreature(guid))
if (instance->IsGridLoaded(creature->GetPositionX(), creature->GetPositionY())) if (instance->IsGridLoaded(creature->GetPositionX(), creature->GetPositionY()))

View File

@@ -1086,7 +1086,7 @@ public:
} }
} }
for (ObjectGuid const guid : allianceGuardsGUID) for (ObjectGuid const& guid : allianceGuardsGUID)
if (Creature* temp = ObjectAccessor::GetCreature(*me, guid)) if (Creature* temp = ObjectAccessor::GetCreature(*me, guid))
temp->DespawnOrUnsummon(); temp->DespawnOrUnsummon();
@@ -2415,7 +2415,7 @@ public:
SaurfangGUID.Clear(); SaurfangGUID.Clear();
} }
for (ObjectGuid const guid : hordeGuardsGUID) for (ObjectGuid const& guid : hordeGuardsGUID)
if (Creature* temp = ObjectAccessor::GetCreature(*me, guid)) if (Creature* temp = ObjectAccessor::GetCreature(*me, guid))
temp->DespawnOrUnsummon(); temp->DespawnOrUnsummon();

View File

@@ -699,7 +699,7 @@ public:
if (counter > 12) if (counter > 12)
{ {
bool failed = false; bool failed = false;
for (ObjectGuid const guid : unitList) for (ObjectGuid const& guid : unitList)
if (Unit* c = ObjectAccessor::GetUnit(*me, guid)) if (Unit* c = ObjectAccessor::GetUnit(*me, guid))
if (c->HasAuraType(SPELL_AURA_PERIODIC_DUMMY)) if (c->HasAuraType(SPELL_AURA_PERIODIC_DUMMY))
{ {
@@ -753,7 +753,7 @@ public:
Unit* getTrigger() Unit* getTrigger()
{ {
std::list<Unit*> tmpList; std::list<Unit*> tmpList;
for (ObjectGuid const guid : unitList) for (ObjectGuid const& guid : unitList)
if (Unit* c = ObjectAccessor::GetUnit(*me, guid)) if (Unit* c = ObjectAccessor::GetUnit(*me, guid))
if (!c->HasAuraType(SPELL_AURA_PERIODIC_DUMMY)) if (!c->HasAuraType(SPELL_AURA_PERIODIC_DUMMY))
tmpList.push_back(c); tmpList.push_back(c);
@@ -772,7 +772,7 @@ public:
{ {
me->MonsterYell("Fire consumes! You've tried and failed. Let there be no doubt, justice prevailed!", LANG_UNIVERSAL, 0); me->MonsterYell("Fire consumes! You've tried and failed. Let there be no doubt, justice prevailed!", LANG_UNIVERSAL, 0);
me->PlayDirectSound(11967); me->PlayDirectSound(11967);
for (ObjectGuid const guid : unitList) for (ObjectGuid const& guid : unitList)
if (Unit* c = ObjectAccessor::GetUnit(*me, guid)) if (Unit* c = ObjectAccessor::GetUnit(*me, guid))
c->RemoveAllAuras(); c->RemoveAllAuras();

View File

@@ -220,7 +220,7 @@ public:
{ {
if (!m_uiAncientGemGUID.empty()) if (!m_uiAncientGemGUID.empty())
{ {
for (ObjectGuid const guid : m_uiAncientGemGUID) for (ObjectGuid const& guid : m_uiAncientGemGUID)
{ {
//don't know how long it expected //don't know how long it expected
DoRespawnGameObject(guid, DAY); DoRespawnGameObject(guid, DAY);

View File

@@ -183,7 +183,7 @@ public:
instance->LoadGrid(instancePositions[0].GetPositionX(), instancePositions[0].GetPositionY()); instance->LoadGrid(instancePositions[0].GetPositionX(), instancePositions[0].GetPositionY());
instance->LoadGrid(instancePositions[1].GetPositionX(), instancePositions[1].GetPositionY()); instance->LoadGrid(instancePositions[1].GetPositionX(), instancePositions[1].GetPositionY());
for (ObjectGuid const guid : _prisonersSet) for (ObjectGuid const& guid : _prisonersSet)
if (Creature* orc = instance->GetCreature(guid)) if (Creature* orc = instance->GetCreature(guid))
{ {
uint8 index = orc->GetDistance(instancePositions[0]) < 80.0f ? 0 : 1; uint8 index = orc->GetDistance(instancePositions[0]) < 80.0f ? 0 : 1;
@@ -193,7 +193,7 @@ public:
orc->SetStandState(UNIT_STAND_STATE_STAND); orc->SetStandState(UNIT_STAND_STATE_STAND);
} }
for (ObjectGuid const guid : _initalFlamesSet) for (ObjectGuid const& guid : _initalFlamesSet)
if (GameObject* gobject = instance->GetGameObject(guid)) if (GameObject* gobject = instance->GetGameObject(guid))
{ {
gobject->SetRespawnTime(0); gobject->SetRespawnTime(0);
@@ -215,14 +215,14 @@ public:
player->KilledMonsterCredit(NPC_LODGE_QUEST_TRIGGER); player->KilledMonsterCredit(NPC_LODGE_QUEST_TRIGGER);
} }
for (ObjectGuid const guid : _finalFlamesSet) for (ObjectGuid const& guid : _finalFlamesSet)
if (GameObject* gobject = instance->GetGameObject(guid)) if (GameObject* gobject = instance->GetGameObject(guid))
{ {
gobject->SetRespawnTime(0); gobject->SetRespawnTime(0);
gobject->UpdateObjectVisibility(true); gobject->UpdateObjectVisibility(true);
} }
for (ObjectGuid const guid : _prisonersSet) for (ObjectGuid const& guid : _prisonersSet)
if (Creature* orc = instance->GetCreature(guid)) if (Creature* orc = instance->GetCreature(guid))
if (roll_chance_i(25)) if (roll_chance_i(25))
orc->HandleEmoteCommand(EMOTE_ONESHOT_CHEER); orc->HandleEmoteCommand(EMOTE_ONESHOT_CHEER);

View File

@@ -60,7 +60,7 @@ public:
} }
GuidSet eCopy = encounterNPCs; GuidSet eCopy = encounterNPCs;
for (ObjectGuid const guid : eCopy) for (ObjectGuid const& guid : eCopy)
if (Creature* creature = instance->GetCreature(guid)) if (Creature* creature = instance->GetCreature(guid))
creature->DespawnOrUnsummon(); creature->DespawnOrUnsummon();
} }
@@ -184,7 +184,7 @@ public:
// Xinef: delete all spawns // Xinef: delete all spawns
GuidSet eCopy = encounterNPCs; GuidSet eCopy = encounterNPCs;
for (ObjectGuid guid : eCopy) for (ObjectGuid const& guid : eCopy)
if (Creature* creature = instance->GetCreature(guid)) if (Creature* creature = instance->GetCreature(guid))
creature->DespawnOrUnsummon(); creature->DespawnOrUnsummon();
} }
@@ -227,7 +227,7 @@ public:
void SummonPortalKeeper() void SummonPortalKeeper()
{ {
Creature* rift = nullptr; Creature* rift = nullptr;
for (ObjectGuid const guid : encounterNPCs) for (ObjectGuid const& guid : encounterNPCs)
if (Creature* summon = instance->GetCreature(guid)) if (Creature* summon = instance->GetCreature(guid))
if (summon->GetEntry() == NPC_TIME_RIFT) if (summon->GetEntry() == NPC_TIME_RIFT)
{ {

View File

@@ -79,7 +79,7 @@ public:
bDeepBreath = true; bDeepBreath = true;
if( uiData == NOT_STARTED ) if( uiData == NOT_STARTED )
{ {
for (ObjectGuid guid : minions) for (ObjectGuid const& guid : minions)
if (Creature* c = instance->GetCreature(guid)) if (Creature* c = instance->GetCreature(guid))
c->DespawnOrUnsummon(); c->DespawnOrUnsummon();
minions.clear(); minions.clear();

View File

@@ -187,7 +187,7 @@ public:
events.ScheduleEvent(EVENT_PARALYZE, 15000); events.ScheduleEvent(EVENT_PARALYZE, 15000);
break; break;
case EVENT_SWARMER_ATTACK: case EVENT_SWARMER_ATTACK:
for (ObjectGuid guid : _swarmers) for (ObjectGuid const& guid : _swarmers)
if (Creature* swarmer = me->GetMap()->GetCreature(guid)) if (Creature* swarmer = me->GetMap()->GetCreature(guid))
if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM)) if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM))
swarmer->AI()->AttackStart(target); swarmer->AI()->AttackStart(target);

View File

@@ -63,7 +63,7 @@ public:
{ {
BossAI::EnterEvadeMode(); BossAI::EnterEvadeMode();
for (ObjectGuid guid : Eggs) for (ObjectGuid const& guid : Eggs)
if (Creature* egg = me->GetMap()->GetCreature(guid)) if (Creature* egg = me->GetMap()->GetCreature(guid))
egg->Respawn(); egg->Respawn();

View File

@@ -200,7 +200,7 @@ public:
} }
uint16 phase = 1; uint16 phase = 1;
for (ObjectGuid guid : summons) for (ObjectGuid const& guid : summons)
{ {
if (Creature* summon = ObjectAccessor::GetCreature(*me, guid)) if (Creature* summon = ObjectAccessor::GetCreature(*me, guid))
phase |= summon->GetPhaseMask(); phase |= summon->GetPhaseMask();

View File

@@ -420,7 +420,7 @@ public:
summons.RemoveNotExisting(); summons.RemoveNotExisting();
if (!summons.empty()) if (!summons.empty())
{ {
for (ObjectGuid const summonGuid : summons) for (ObjectGuid const& summonGuid : summons)
{ {
Creature* summon = ObjectAccessor::GetCreature(*me, summonGuid); Creature* summon = ObjectAccessor::GetCreature(*me, summonGuid);
if (summon && summon->GetEntry() == NPC_FIRE_CYCLONE) if (summon && summon->GetEntry() == NPC_FIRE_CYCLONE)
@@ -556,7 +556,7 @@ public:
uint8 iter = 0; uint8 iter = 0;
if (!summons.empty()) if (!summons.empty())
{ {
for (ObjectGuid const summonGuid : summons) for (ObjectGuid const& summonGuid : summons)
{ {
Creature* summon = ObjectAccessor::GetCreature(*me, summonGuid); Creature* summon = ObjectAccessor::GetCreature(*me, summonGuid);
if (summon && summon->GetEntry() == NPC_FIRE_CYCLONE && iter == rand) if (summon && summon->GetEntry() == NPC_FIRE_CYCLONE && iter == rand)
@@ -636,7 +636,7 @@ public:
return; return;
} }
for (ObjectGuid const guid : summons) for (ObjectGuid const& guid : summons)
{ {
Creature* tsunami = ObjectAccessor::GetCreature(*me, guid); Creature* tsunami = ObjectAccessor::GetCreature(*me, guid);
if (!tsunami || tsunami->GetEntry() != NPC_FLAME_TSUNAMI) if (!tsunami || tsunami->GetEntry() != NPC_FLAME_TSUNAMI)
@@ -1129,7 +1129,7 @@ public:
{ {
summons.RemoveNotExisting(); summons.RemoveNotExisting();
summons.DespawnEntry(NPC_TWILIGHT_WHELP); summons.DespawnEntry(NPC_TWILIGHT_WHELP);
for (ObjectGuid const summonGuid : summons) for (ObjectGuid const& summonGuid : summons)
{ {
Creature const* summon = ObjectAccessor::GetCreature(*me, summonGuid); Creature const* summon = ObjectAccessor::GetCreature(*me, summonGuid);
if (!summon || !summon->IsAlive() || summon->GetEntry() != NPC_TWILIGHT_EGG) if (!summon || !summon->IsAlive() || summon->GetEntry() != NPC_TWILIGHT_EGG)

View File

@@ -279,7 +279,7 @@ public:
case INSTANCE_PROGRESS_CHAMPION_GROUP_DIED_3: case INSTANCE_PROGRESS_CHAMPION_GROUP_DIED_3:
// revert to INSTANCE_PROGRESS_INITIAL // revert to INSTANCE_PROGRESS_INITIAL
{ {
for (ObjectGuid const guid : VehicleList) for (ObjectGuid const& guid : VehicleList)
if (Creature* veh = instance->GetCreature(guid)) if (Creature* veh = instance->GetCreature(guid))
{ {
veh->DespawnOrUnsummon(); veh->DespawnOrUnsummon();
@@ -567,7 +567,7 @@ public:
{ {
Counter = 0; Counter = 0;
InstanceProgress = INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED; InstanceProgress = INSTANCE_PROGRESS_CHAMPIONS_UNMOUNTED;
for (ObjectGuid const guid : VehicleList) for (ObjectGuid const& guid : VehicleList)
if (Creature* veh = instance->GetCreature(guid)) if (Creature* veh = instance->GetCreature(guid))
veh->DespawnOrUnsummon(); veh->DespawnOrUnsummon();
events.ScheduleEvent(EVENT_GRAND_CHAMPIONS_MOVE_SIDE, 0); events.ScheduleEvent(EVENT_GRAND_CHAMPIONS_MOVE_SIDE, 0);

View File

@@ -200,7 +200,7 @@ public:
if( !IsHeroic() ) if( !IsHeroic() )
events.RescheduleEvent(EVENT_RESPAWN_SPHERE, 4000); events.RescheduleEvent(EVENT_RESPAWN_SPHERE, 4000);
for (ObjectGuid guid : summons) for (ObjectGuid const& guid : summons)
if (pInstance) if (pInstance)
if (Creature* c = pInstance->instance->GetCreature(guid)) if (Creature* c = pInstance->instance->GetCreature(guid))
{ {

View File

@@ -73,7 +73,7 @@ public:
// move corpses // move corpses
const ObjectGuid npcs[4] = { NPC_IcehowlGUID, NPC_JaraxxusGUID, NPC_LightbaneGUID, NPC_DarkbaneGUID }; const ObjectGuid npcs[4] = { NPC_IcehowlGUID, NPC_JaraxxusGUID, NPC_LightbaneGUID, NPC_DarkbaneGUID };
for (const ObjectGuid i : npcs) for (ObjectGuid const& i : npcs)
{ {
if (Creature* c = instance->GetCreature(i)) if (Creature* c = instance->GetCreature(i))
{ {
@@ -402,7 +402,7 @@ public:
InstanceProgress = INSTANCE_PROGRESS_FACTION_CHAMPIONS_DEAD; InstanceProgress = INSTANCE_PROGRESS_FACTION_CHAMPIONS_DEAD;
events.RescheduleEvent(EVENT_SCENE_FACTION_CHAMPIONS_DEAD, 2500); events.RescheduleEvent(EVENT_SCENE_FACTION_CHAMPIONS_DEAD, 2500);
for (ObjectGuid guid : NPC_ChampionGUIDs) for (ObjectGuid const& guid : NPC_ChampionGUIDs)
if (Creature* c = instance->GetCreature(guid)) if (Creature* c = instance->GetCreature(guid))
c->DespawnOrUnsummon(15000); c->DespawnOrUnsummon(15000);
NPC_ChampionGUIDs.clear(); NPC_ChampionGUIDs.clear();
@@ -455,7 +455,7 @@ public:
{ {
EncounterStatus = IN_PROGRESS; EncounterStatus = IN_PROGRESS;
AchievementTimer = 0; AchievementTimer = 0;
for (ObjectGuid guid : NPC_ChampionGUIDs) for (ObjectGuid const& guid : NPC_ChampionGUIDs)
if (Creature* c = instance->GetCreature(guid)) if (Creature* c = instance->GetCreature(guid))
if (!c->IsInCombat()) if (!c->IsInCombat())
if (Unit* target = c->SelectNearestTarget(200.0f)) if (Unit* target = c->SelectNearestTarget(200.0f))
@@ -1093,7 +1093,7 @@ public:
} }
case EVENT_CHAMPIONS_ATTACK: case EVENT_CHAMPIONS_ATTACK:
{ {
for (ObjectGuid guid : NPC_ChampionGUIDs) for (ObjectGuid const& guid : NPC_ChampionGUIDs)
if (Creature* c = instance->GetCreature(guid)) if (Creature* c = instance->GetCreature(guid))
{ {
c->SetReactState(REACT_AGGRESSIVE); c->SetReactState(REACT_AGGRESSIVE);
@@ -1493,7 +1493,7 @@ public:
case INSTANCE_PROGRESS_JARAXXUS_DEAD: case INSTANCE_PROGRESS_JARAXXUS_DEAD:
if( Creature* c = instance->GetCreature(NPC_BarrettGUID) ) if( Creature* c = instance->GetCreature(NPC_BarrettGUID) )
c->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); c->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP);
for (ObjectGuid guid : NPC_ChampionGUIDs) for (ObjectGuid const& guid : NPC_ChampionGUIDs)
if (Creature* c = instance->GetCreature(guid)) if (Creature* c = instance->GetCreature(guid))
c->DespawnOrUnsummon(); c->DespawnOrUnsummon();
NPC_ChampionGUIDs.clear(); NPC_ChampionGUIDs.clear();

View File

@@ -958,7 +958,7 @@ public:
TSSpawnPos.GetAngle(&TSMidPos); TSSpawnPos.GetAngle(&TSMidPos);
for (ObjectGuid guid : summons) for (ObjectGuid const& guid : summons)
if (Creature* c = pInstance->instance->GetCreature(guid)) if (Creature* c = pInstance->instance->GetCreature(guid))
{ {
float hx, hy, hz, ho; float hx, hy, hz, ho;
@@ -974,7 +974,7 @@ public:
if (pInstance) if (pInstance)
if (Creature* c = pInstance->instance->GetCreature(pInstance->GetGuidData(DATA_SINDRAGOSA_GUID))) if (Creature* c = pInstance->instance->GetCreature(pInstance->GetGuidData(DATA_SINDRAGOSA_GUID)))
{ {
for (ObjectGuid guid : summons) for (ObjectGuid const& guid : summons)
if (Creature* s = pInstance->instance->GetCreature(guid)) if (Creature* s = pInstance->instance->GetCreature(guid))
if (s->IsAlive()) if (s->IsAlive())
Unit::Kill(c, s); Unit::Kill(c, s);
@@ -1026,7 +1026,7 @@ public:
me->SetFacingTo(5.26f); me->SetFacingTo(5.26f);
me->SetOrientation(5.26f); me->SetOrientation(5.26f);
me->SetHomePosition(*me); me->SetHomePosition(*me);
for (ObjectGuid guid : summons) for (ObjectGuid const& guid : summons)
if (Creature* c = pInstance->instance->GetCreature(guid)) if (Creature* c = pInstance->instance->GetCreature(guid))
{ {
c->SetFacingTo(5.26f); c->SetFacingTo(5.26f);
@@ -1056,7 +1056,7 @@ public:
float offset = frand(0.0f, 10.0f); float offset = frand(0.0f, 10.0f);
c->GetMotionMaster()->MovePoint(0, 1047.0f + offset, 118.0f + offset, 628.2f); c->GetMotionMaster()->MovePoint(0, 1047.0f + offset, 118.0f + offset, 628.2f);
c->SetHomePosition(*me); c->SetHomePosition(*me);
for (ObjectGuid guid : summons) for (ObjectGuid const& guid : summons)
if (Creature* s = pInstance->instance->GetCreature(guid)) if (Creature* s = pInstance->instance->GetCreature(guid))
{ {
if (s->GetEntry() == NPC_FALLEN_WARRIOR) if (s->GetEntry() == NPC_FALLEN_WARRIOR)

View File

@@ -369,7 +369,7 @@ public:
{ {
// shouldn't be casted on any victim of summoned mobs // shouldn't be casted on any victim of summoned mobs
bool valid = true; bool valid = true;
for (ObjectGuid const guid : summons) for (ObjectGuid const& guid : summons)
if (Creature* c = ObjectAccessor::GetCreature(*me, guid)) if (Creature* c = ObjectAccessor::GetCreature(*me, guid))
if (c->IsAlive() && c->GetVictim() && c->GetVictim()->GetGUID() == plr->GetGUID()) if (c->IsAlive() && c->GetVictim() && c->GetVictim()->GetGUID() == plr->GetGUID())
{ {

View File

@@ -191,7 +191,7 @@ public:
bool IsValidExplosionTarget(WorldObject* target) bool IsValidExplosionTarget(WorldObject* target)
{ {
for (ObjectGuid const guid : blockList) for (ObjectGuid const& guid : blockList)
{ {
if (target->GetGUID() == guid) if (target->GetGUID() == guid)
return false; return false;

View File

@@ -291,7 +291,7 @@ public:
events.RepeatEvent(30000); events.RepeatEvent(30000);
else else
{ {
for (ObjectGuid guid : summons) for (ObjectGuid const& guid : summons)
if (Creature* sv = ObjectAccessor::GetCreature(*me, guid)) if (Creature* sv = ObjectAccessor::GetCreature(*me, guid))
{ {
sv->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); sv->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);

View File

@@ -2321,7 +2321,7 @@ public:
void RemoveAll() void RemoveAll()
{ {
for (ObjectGuid guid : FlameList) for (ObjectGuid const& guid : FlameList)
if (Creature* c = ObjectAccessor::GetCreature(*me, guid)) if (Creature* c = ObjectAccessor::GetCreature(*me, guid))
c->DespawnOrUnsummon(); c->DespawnOrUnsummon();
FlameList.clear(); FlameList.clear();

View File

@@ -1219,7 +1219,7 @@ void instance_ulduar::instance_ulduar_InstanceMapScript::SpawnLeviathanEncounter
{ {
if (!_leviathanVehicles.empty()) if (!_leviathanVehicles.empty())
{ {
for (ObjectGuid guid : _leviathanVehicles) for (ObjectGuid const& guid : _leviathanVehicles)
if (Creature* cr = instance->GetCreature(guid)) if (Creature* cr = instance->GetCreature(guid))
if (Vehicle* veh = cr->GetVehicleKit()) if (Vehicle* veh = cr->GetVehicleKit())
veh->Dismiss(); veh->Dismiss();

View File

@@ -209,7 +209,7 @@ public:
bool bIsWaterElementsAlive = false; bool bIsWaterElementsAlive = false;
if (!globules.empty()) if (!globules.empty())
{ {
for (ObjectGuid const guid : globules) for (ObjectGuid const& guid : globules)
if (Creature* pTemp = ObjectAccessor::GetCreature(*me, guid)) if (Creature* pTemp = ObjectAccessor::GetCreature(*me, guid))
if (pTemp->IsAlive()) if (pTemp->IsAlive())
{ {

View File

@@ -124,7 +124,7 @@ public:
{ {
bool found = false; bool found = false;
if (pInstance) if (pInstance)
for (ObjectGuid guid : spheres) for (ObjectGuid const& guid : spheres)
if (Creature* c = pInstance->instance->GetCreature(guid)) if (Creature* c = pInstance->instance->GetCreature(guid))
if (me->GetDistance(c) < 3.0f) if (me->GetDistance(c) < 3.0f)
{ {

View File

@@ -434,7 +434,7 @@ public:
DoUpdateWorldState(WORLD_STATE_VH_PRISON_STATE, (uint32)GateHealth); DoUpdateWorldState(WORLD_STATE_VH_PRISON_STATE, (uint32)GateHealth);
DoUpdateWorldState(WORLD_STATE_VH_WAVE_COUNT, (uint32)WaveCount); DoUpdateWorldState(WORLD_STATE_VH_WAVE_COUNT, (uint32)WaveCount);
for (ObjectGuid guid : GO_ActivationCrystalGUID) for (ObjectGuid const& guid : GO_ActivationCrystalGUID)
if (GameObject* go = instance->GetGameObject(guid)) if (GameObject* go = instance->GetGameObject(guid))
{ {
HandleGameObject(ObjectGuid::Empty, false, go); // not used yet HandleGameObject(ObjectGuid::Empty, false, go); // not used yet
@@ -528,7 +528,7 @@ public:
CLEANED = true; CLEANED = true;
// reset defense crystals // reset defense crystals
for (ObjectGuid guid : GO_ActivationCrystalGUID) for (ObjectGuid const& guid : GO_ActivationCrystalGUID)
if (GameObject* go = instance->GetGameObject(guid)) if (GameObject* go = instance->GetGameObject(guid))
{ {
HandleGameObject(ObjectGuid::Empty, false, go); // not used yet HandleGameObject(ObjectGuid::Empty, false, go); // not used yet
@@ -555,7 +555,7 @@ public:
NPC_PortalGUID.Clear(); NPC_PortalGUID.Clear();
// remove trash // remove trash
for (ObjectGuid guid : trashMobs) for (ObjectGuid const& guid : trashMobs)
if (Creature* c = instance->GetCreature(guid)) if (Creature* c = instance->GetCreature(guid))
c->DespawnOrUnsummon(); c->DespawnOrUnsummon();

View File

@@ -171,7 +171,7 @@ public:
void CheckSummons() void CheckSummons()
{ {
bool allow = true; bool allow = true;
for (ObjectGuid guid : summons) for (ObjectGuid const& guid : summons)
if (Creature* cr = ObjectAccessor::GetCreature(*me, guid)) if (Creature* cr = ObjectAccessor::GetCreature(*me, guid))
if (cr->IsAlive()) if (cr->IsAlive())
allow = false; allow = false;

View File

@@ -176,7 +176,7 @@ public:
if (action == ACTION_BIND_MINIONS) if (action == ACTION_BIND_MINIONS)
me->CastSpell(me, SPELL_ARTRUIS_BINDING, true); me->CastSpell(me, SPELL_ARTRUIS_BINDING, true);
for (ObjectGuid const guid : summons) for (ObjectGuid const& guid : summons)
{ {
Creature* minion = ObjectAccessor::GetCreature(*me, guid); Creature* minion = ObjectAccessor::GetCreature(*me, guid);
if (minion && minion->IsAlive()) if (minion && minion->IsAlive())

View File

@@ -187,7 +187,7 @@ public:
if (type == DATA_SHADE_OF_AKAMA && state == DONE) if (type == DATA_SHADE_OF_AKAMA && state == DONE)
{ {
for (ObjectGuid const guid : ashtongueGUIDs) for (ObjectGuid const& guid : ashtongueGUIDs)
if (Creature* ashtongue = instance->GetCreature(guid)) if (Creature* ashtongue = instance->GetCreature(guid))
ashtongue->setFaction(FACTION_ASHTONGUE); ashtongue->setFaction(FACTION_ASHTONGUE);
} }
@@ -293,7 +293,7 @@ public:
void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{ {
for (ObjectGuid const guid : _turtleSet) for (ObjectGuid const& guid : _turtleSet)
if (Creature* turtle = ObjectAccessor::GetCreature(*GetUnitOwner(), guid)) if (Creature* turtle = ObjectAccessor::GetCreature(*GetUnitOwner(), guid))
{ {
turtle->TauntFadeOut(GetUnitOwner()); turtle->TauntFadeOut(GetUnitOwner());

View File

@@ -218,7 +218,7 @@ public:
void ResetPrisoners(GuidSet prisoners) void ResetPrisoners(GuidSet prisoners)
{ {
for (ObjectGuid guid : prisoners) for (ObjectGuid const& guid : prisoners)
if (Creature* prisoner = instance->GetCreature(guid)) if (Creature* prisoner = instance->GetCreature(guid))
ResetPrisoner(prisoner); ResetPrisoner(prisoner);
} }
@@ -300,7 +300,7 @@ public:
void ActivatePrisoners(GuidSet prisoners) void ActivatePrisoners(GuidSet prisoners)
{ {
for (ObjectGuid guid : prisoners) for (ObjectGuid const& guid : prisoners)
if (Creature* prisoner = instance->GetCreature(guid)) if (Creature* prisoner = instance->GetCreature(guid))
{ {
prisoner->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_NON_ATTACKABLE); prisoner->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_NON_ATTACKABLE);

View File

@@ -118,7 +118,7 @@ public:
{ {
if (state == IN_PROGRESS) if (state == IN_PROGRESS)
{ {
for (ObjectGuid const guid : _wardersSet) for (ObjectGuid const& guid : _wardersSet)
if (Creature* warder = instance->GetCreature(guid)) if (Creature* warder = instance->GetCreature(guid))
if (warder->IsAlive()) if (warder->IsAlive())
{ {
@@ -128,7 +128,7 @@ public:
} }
else else
{ {
for (ObjectGuid const guid : _cubesSet) for (ObjectGuid const& guid : _cubesSet)
if (GameObject* cube = instance->GetGameObject(guid)) if (GameObject* cube = instance->GetGameObject(guid))
cube->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); cube->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
@@ -149,12 +149,12 @@ public:
magtheridon->SetInCombatWithZone(); magtheridon->SetInCombatWithZone();
break; break;
case DATA_ACTIVATE_CUBES: case DATA_ACTIVATE_CUBES:
for (ObjectGuid const guid : _cubesSet) for (ObjectGuid const& guid : _cubesSet)
if (GameObject* cube = instance->GetGameObject(guid)) if (GameObject* cube = instance->GetGameObject(guid))
cube->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); cube->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
break; break;
case DATA_COLLAPSE: case DATA_COLLAPSE:
for (ObjectGuid const guid : _columnSet) for (ObjectGuid const& guid : _columnSet)
if (GameObject* column = instance->GetGameObject(guid)) if (GameObject* column = instance->GetGameObject(guid))
column->SetGoState(GOState(data)); column->SetGoState(GOState(data));
break; break;

View File

@@ -105,7 +105,7 @@ public:
void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{ {
for (ObjectGuid const guid : _falconSet) for (ObjectGuid const& guid : _falconSet)
if (Creature* falcon = ObjectAccessor::GetCreature(*GetUnitOwner(), guid)) if (Creature* falcon = ObjectAccessor::GetCreature(*GetUnitOwner(), guid))
{ {
falcon->TauntFadeOut(GetUnitOwner()); falcon->TauntFadeOut(GetUnitOwner());

View File

@@ -1097,7 +1097,7 @@ public:
{ {
if (!summons.empty()) if (!summons.empty())
{ {
for (ObjectGuid guid : summons) for (ObjectGuid const& guid : summons)
if (Creature* cr = ObjectAccessor::GetCreature(*me, guid)) if (Creature* cr = ObjectAccessor::GetCreature(*me, guid))
{ {
float x, y, z, o; float x, y, z, o;

View File

@@ -983,7 +983,7 @@ public:
{ {
if (!Patients.empty()) if (!Patients.empty())
{ {
for (ObjectGuid const guid : Patients) for (ObjectGuid const& guid : Patients)
{ {
if (Creature* patient = ObjectAccessor::GetCreature(*me, guid)) if (Creature* patient = ObjectAccessor::GetCreature(*me, guid))
patient->setDeathState(JUST_DIED); patient->setDeathState(JUST_DIED);