From 35ab7dfa8ef5f79af0ee69ed8c19f4be7a635af5 Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 22 Nov 2023 00:21:48 +0100 Subject: Core/Phasing: Fixed startup crash caused by accessing uninitialized global variable Closes #29449 --- src/server/game/Phasing/PhasingHandler.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/server/game/Phasing/PhasingHandler.cpp') diff --git a/src/server/game/Phasing/PhasingHandler.cpp b/src/server/game/Phasing/PhasingHandler.cpp index b4eef7b5e90..9c11eb1c56e 100644 --- a/src/server/game/Phasing/PhasingHandler.cpp +++ b/src/server/game/Phasing/PhasingHandler.cpp @@ -538,9 +538,10 @@ void PhasingHandler::InitDbPhaseShift(PhaseShift& phaseShift, uint8 phaseUseFlag if (phaseId) phaseShift.AddPhase(phaseId, GetPhaseFlags(phaseId), nullptr); - else if (std::vector const* phasesInGroup = sDB2Manager.GetPhasesForGroup(phaseGroupId)) - for (uint32 phaseInGroup : *phasesInGroup) - phaseShift.AddPhase(phaseInGroup, GetPhaseFlags(phaseInGroup), nullptr); + else if (phaseGroupId) + if (std::vector const* phasesInGroup = sDB2Manager.GetPhasesForGroup(phaseGroupId)) + for (uint32 phaseInGroup : *phasesInGroup) + phaseShift.AddPhase(phaseInGroup, GetPhaseFlags(phaseInGroup), nullptr); if (phaseShift.Phases.empty() || phaseShift.HasPhase(DEFAULT_PHASE)) { -- cgit v1.2.3