aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2022-12-31 16:57:59 +0100
committerShauren <shauren.trinity@gmail.com>2022-12-31 16:57:59 +0100
commit2c044ea9f558d5b181d56f1e318c7c96396f69d7 (patch)
treed1c00998102d2043c108ed4fb7328dd9e0819f42
parentdc07faf8f4d3c648114dd370463c599a2f949c20 (diff)
Core/Scenarios: Replace assert with null check
Closes #28639
-rw-r--r--src/server/game/Scenarios/Scenario.cpp5
1 files changed, 4 insertions, 1 deletions
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;