Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/SAI: add param3 to SMART_ACTION_CALL_TIMED_ACTIONLIST to allow it to override a currently running actionlist.

Browse Source
This commit is contained in:
Wyrserth
2019-06-27 01:48:12 +02:00
parent 81939b9685
commit eeba12778b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/AI/SmartScripts/SmartScript.cpp
View File

@@ -3802,8 +3802,8 @@ void SmartScript::SetTimedActionList(SmartScriptHolder& e, uint32 entry, Unit* i
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())
// Do NOT allow to start a new actionlist if a previous one is already running, unless explicitly allowed. We need to always finish the current actionlist
if (!e.action.timedActionList.allowOverride && !mTimedActionList.empty())
return;
mTimedActionList.clear();

1
src/server/game/AI/SmartScripts/SmartScriptMgr.h
View File

@@ -962,6 +962,7 @@ struct SmartAction
{
uint32 id;
uint32 timerType;
uint32 allowOverride;
} timedActionList;
struct