diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2018-01-17 02:17:49 -0300 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-06-16 01:00:11 +0200 |
| commit | 21556667c16b282b77934bddee3d86f0c632ef31 (patch) | |
| tree | 4669148763e4d450f12a46a7f2c8a7a2f6913a87 /src/server/game/Achievements/CriteriaHandler.cpp | |
| parent | 5b5bc4c5c7cad020bd831185057451b674c234d8 (diff) | |
Core/Globals: throw some RAII into ObjectMgr, and load templates into vectors
Ref #14274
(cherry picked from commit b64c5043140dc7b7908e259e441de16cc0261320)
Diffstat (limited to 'src/server/game/Achievements/CriteriaHandler.cpp')
| -rw-r--r-- | src/server/game/Achievements/CriteriaHandler.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/server/game/Achievements/CriteriaHandler.cpp b/src/server/game/Achievements/CriteriaHandler.cpp index 4552cd989c2..d8e6a0321c0 100644 --- a/src/server/game/Achievements/CriteriaHandler.cpp +++ b/src/server/game/Achievements/CriteriaHandler.cpp @@ -4214,9 +4214,12 @@ void CriteriaMgr::LoadCriteriaList() scenarioCriteriaTreeIds[scenarioStep->Criteriatreeid] = scenarioStep; std::unordered_map<uint32 /*criteriaTreeID*/, QuestObjective const*> questObjectiveCriteriaTreeIds; - for (std::pair<uint32 /*questID*/, Quest const*> itr : sObjectMgr->GetQuestTemplates()) + for (auto const& questTemplate : sObjectMgr->GetQuestTemplates()) { - for (QuestObjective const& objective : itr.second->Objectives) + if (!questTemplate) + continue; + + for (QuestObjective const& objective : questTemplate->Objectives) { if (objective.Type != QUEST_OBJECTIVE_CRITERIA_TREE) continue; |