From 2c044ea9f558d5b181d56f1e318c7c96396f69d7 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 31 Dec 2022 16:57:59 +0100 Subject: Core/Scenarios: Replace assert with null check Closes #28639 --- src/server/game/Scenarios/Scenario.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/server') diff --git a/src/server/game/Scenarios/Scenario.cpp b/src/server/game/Scenarios/Scenario.cpp index 33bf970a09a..ada35f418f6 100644 --- a/src/server/game/Scenarios/Scenario.cpp +++ b/src/server/game/Scenarios/Scenario.cpp @@ -174,7 +174,10 @@ bool Scenario::CanUpdateCriteriaTree(Criteria const * /*criteria*/, CriteriaTree bool Scenario::CanCompleteCriteriaTree(CriteriaTree const* tree) { - ScenarioStepEntry const* step = ASSERT_NOTNULL(tree->ScenarioStep); + ScenarioStepEntry const* step = tree->ScenarioStep; + if (!step) + return false; + ScenarioStepState const state = GetStepState(step); if (state == SCENARIO_STEP_DONE) return false; -- cgit v1.2.3