From 3555f5916dd3c8ce7c1907b1a2ddbdc9b88c0a83 Mon Sep 17 00:00:00 2001 From: IntelligentQuantum Date: Sun, 17 Apr 2022 06:16:08 +0430 Subject: [PATCH] fix(Core/SmartScripts): don't allow to start a new SAI actionlist while the entity is already running one (#10230) * cherry-pick commit (https://github.com/TrinityCore/TrinityCore/commit/2b1cde25604b6400ac327801d8e1649e30688f5a) --- src/server/game/AI/SmartScripts/SmartScript.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 57ab11041..49eb92a46 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -5075,6 +5075,12 @@ void SmartScript::SetScript9(SmartScriptHolder& e, uint32 entry) return; } + // Do NOT allow to start a new actionlist if a previous one is already running. We need to always finish the current actionlist + if (!mTimedActionList.empty()) + { + return; + } + mTimedActionList.clear(); mTimedActionList = sSmartScriptMgr->GetScript(entry, SMART_SCRIPT_TYPE_TIMED_ACTIONLIST); if (mTimedActionList.empty())