aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Phasing/PhasingHandler.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2023-11-22 00:21:48 +0100
committerShauren <shauren.trinity@gmail.com>2023-11-22 00:21:48 +0100
commit35ab7dfa8ef5f79af0ee69ed8c19f4be7a635af5 (patch)
tree7ade2eb66a0b3af1314ed8cd9bb1bb21dde229b2 /src/server/game/Phasing/PhasingHandler.cpp
parent5052fa3ea115ff3479e70e34a8dd76dfa66af81c (diff)
Core/Phasing: Fixed startup crash caused by accessing uninitialized global variable
Closes #29449
Diffstat (limited to 'src/server/game/Phasing/PhasingHandler.cpp')
-rw-r--r--src/server/game/Phasing/PhasingHandler.cpp7
1 files changed, 4 insertions, 3 deletions
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<uint32> const* phasesInGroup = sDB2Manager.GetPhasesForGroup(phaseGroupId))
- for (uint32 phaseInGroup : *phasesInGroup)
- phaseShift.AddPhase(phaseInGroup, GetPhaseFlags(phaseInGroup), nullptr);
+ else if (phaseGroupId)
+ if (std::vector<uint32> const* phasesInGroup = sDB2Manager.GetPhasesForGroup(phaseGroupId))
+ for (uint32 phaseInGroup : *phasesInGroup)
+ phaseShift.AddPhase(phaseInGroup, GetPhaseFlags(phaseInGroup), nullptr);
if (phaseShift.Phases.empty() || phaseShift.HasPhase(DEFAULT_PHASE))
{