From 0af520b10b98e3ae7b0d2d624d70de0ed7e66aff Mon Sep 17 00:00:00 2001 From: ModoX Date: Sun, 26 Nov 2023 22:19:05 +0100 Subject: Scripts/Conditions: Fallback to other targets to get map if first target is invalid * fixes crash in Ulduar when reaching Assembly of Iron / Kologarn / Algalon area (cherry picked from commit b1c5e3809ca92ba6f172fefd9711788a7b2a8df8) --- src/server/game/Conditions/ConditionMgr.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index a7a74704a5d..8f010caee88 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -161,7 +161,14 @@ ConditionSourceInfo::ConditionSourceInfo(WorldObject const* target0, WorldObject mConditionTargets[0] = target0; mConditionTargets[1] = target1; mConditionTargets[2] = target2; - mConditionMap = target0 ? target0->GetMap() : nullptr; + if (target0) + mConditionMap = target0->GetMap(); + else if (target1) + mConditionMap = target1->GetMap(); + else if (target2) + mConditionMap = target2->GetMap(); + else + mConditionMap = nullptr; mLastFailedCondition = nullptr; } -- cgit v1.2.3