From 51fbda4223442635a35d3225c0797d0151ea7051 Mon Sep 17 00:00:00 2001 From: Treeston Date: Sun, 4 Aug 2019 12:22:57 +0200 Subject: Core/Pooling: Quest pooling rewrite: (PR#23627) - Split quest pooling from PoolMgr (into QuestPoolMgr) - Proper saving/restoring on server restart - No more hacking into sObjectMgr to insert/remove available quests (cherry picked from commit a5e73e41c0e813e674bb0a644e0052052435494e) --- src/server/game/Handlers/QueryHandler.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/server/game/Handlers/QueryHandler.cpp') diff --git a/src/server/game/Handlers/QueryHandler.cpp b/src/server/game/Handlers/QueryHandler.cpp index c146cefcb91..eca0a1e7556 100644 --- a/src/server/game/Handlers/QueryHandler.cpp +++ b/src/server/game/Handlers/QueryHandler.cpp @@ -258,15 +258,13 @@ void WorldSession::HandleQueryQuestCompletionNPCs(WorldPackets::Query::QueryQues questCompletionNPC.QuestID = questID; - auto creatures = sObjectMgr->GetCreatureQuestInvolvedRelationReverseBounds(questID); - for (auto it = creatures.first; it != creatures.second; ++it) - questCompletionNPC.NPCs.push_back(it->second); + for (auto const& creatures : sObjectMgr->GetCreatureQuestInvolvedRelationReverseBounds(questID)) + questCompletionNPC.NPCs.push_back(creatures.second); - auto gos = sObjectMgr->GetGOQuestInvolvedRelationReverseBounds(questID); - for (auto it = gos.first; it != gos.second; ++it) - questCompletionNPC.NPCs.push_back(it->second | 0x80000000); // GO mask + for (auto const& gos : sObjectMgr->GetGOQuestInvolvedRelationReverseBounds(questID)) + questCompletionNPC.NPCs.push_back(gos.second | 0x80000000); // GO mask - response.QuestCompletionNPCs.push_back(questCompletionNPC); + response.QuestCompletionNPCs.push_back(std::move(questCompletionNPC)); } SendPacket(response.Write()); -- cgit v1.2.3