From c029f21f3429ab12678e1497614dc7a086fc1703 Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 1 Oct 2021 11:18:29 +0200 Subject: Core/Misc: Fix appleclang 12 warnings (cherry picked from commit 3bf6698116d6d683947ccd23f21bba933dc59a2e) # Conflicts: # src/server/game/Handlers/BlackMarketHandler.cpp # src/server/game/Loot/LootItemStorage.cpp # src/server/scripts/Northrend/Nexus/Oculus/boss_urom.cpp # src/server/shared/DataStores/DB2DatabaseLoader.cpp --- src/server/scripts/Commands/cs_gm.cpp | 2 +- .../TrialOfTheCrusader/instance_trial_of_the_crusader.cpp | 2 +- src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp index c7aea3765f1..da1e85a2d6e 100644 --- a/src/server/scripts/Commands/cs_gm.cpp +++ b/src/server/scripts/Commands/cs_gm.cpp @@ -118,7 +118,7 @@ public: bool footer = false; std::shared_lock lock(*HashMapHolder::GetLock()); - for (auto const [playerGuid, player] : ObjectAccessor::GetPlayers()) + for (auto const& [playerGuid, player] : ObjectAccessor::GetPlayers()) { AccountTypes playerSec = player->GetSession()->GetSecurity(); if ((player->IsGameMaster() || diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp index df6fb16f063..0f0767189c7 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp @@ -416,7 +416,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript } break; case DATA_DESPAWN_SNOBOLDS: - for (ObjectGuid const guid : snoboldGUIDS) + for (ObjectGuid guid : snoboldGUIDS) if (Creature* snobold = instance->GetCreature(guid)) snobold->DespawnOrUnsummon(); snoboldGUIDS.clear(); diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index 7629f2f43b4..0480ffc9340 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -228,7 +228,7 @@ struct boss_shade_of_akama : public BossAI events.Reset(); summons.DespawnAll(); - for (ObjectGuid const spawnerGuid : _spawners) + for (ObjectGuid spawnerGuid : _spawners) if (Creature* spawner = ObjectAccessor::GetCreature(*me, spawnerGuid)) spawner->AI()->DoAction(ACTION_DESPAWN_ALL_SPAWNS); @@ -260,7 +260,7 @@ struct boss_shade_of_akama : public BossAI me->SetWalk(false); events.ScheduleEvent(EVENT_ADD_THREAT, Milliseconds(100)); - for (ObjectGuid const spawnerGuid : _spawners) + for (ObjectGuid spawnerGuid : _spawners) if (Creature* spawner = ObjectAccessor::GetCreature(*me, spawnerGuid)) spawner->AI()->DoAction(ACTION_STOP_SPAWNING); } @@ -273,7 +273,7 @@ struct boss_shade_of_akama : public BossAI if (Creature* akama = instance->GetCreature(DATA_AKAMA_SHADE)) akama->AI()->DoAction(ACTION_SHADE_OF_AKAMA_DEAD); - for (ObjectGuid const spawnerGuid : _spawners) + for (ObjectGuid spawnerGuid : _spawners) if (Creature* spawner = ObjectAccessor::GetCreature(*me, spawnerGuid)) spawner->AI()->DoAction(ACTION_DESPAWN_ALL_SPAWNS); @@ -315,11 +315,11 @@ struct boss_shade_of_akama : public BossAI } case EVENT_START_CHANNELERS_AND_SPAWNERS: { - for (ObjectGuid const summonGuid : summons) + for (ObjectGuid summonGuid : summons) if (Creature* channeler = ObjectAccessor::GetCreature(*me, summonGuid)) channeler->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNINTERACTIBLE); - for (ObjectGuid const spawnerGuid : _spawners) + for (ObjectGuid spawnerGuid : _spawners) if (Creature* spawner = ObjectAccessor::GetCreature(*me, spawnerGuid)) spawner->AI()->DoAction(ACTION_START_SPAWNING); -- cgit v1.2.3