Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions 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 
Port From (https://github.com/TrinityCore/TrinityCore/commit/d197a7ce9b376f45e5de1a5aab3df75b77b62d8f)
This commit is contained in:
hondacrx
2021-12-24 21:09:51 -05:00
parent 85d81d39fc
commit 958dbbb4d9
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/AI/SmartScripts/SmartAIManager.cs
+1
View File
@@ -2899,6 +2899,7 @@ namespace Game.AI
{ {
public uint id; public uint id;
public uint timerType; public uint timerType;
public uint allowOverride;
} }
public struct RandTimedActionList public struct RandTimedActionList
{ {
Source/Game/AI/SmartScripts/SmartScript.cs
+1 -1
View File
@@ -4165,7 +4165,7 @@ namespace Game.AI
public void SetTimedActionList(SmartScriptHolder e, uint entry, Unit invoker) public void SetTimedActionList(SmartScriptHolder e, uint entry, Unit invoker)
{ {
// 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 // 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 (!_timedActionList.Empty()) if (e.Action.timedActionList.allowOverride == 0 && !_timedActionList.Empty())
return; return;
_timedActionList.Clear(); _timedActionList.Clear();