diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 0afee1b82b9..d0892be7507 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -3861,6 +3861,10 @@ 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())