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: Remove reactState param from SMART_ACTION_WP_START (#27255)

Browse Source 
Ref #26728

(cherry picked from commit 04909bada8)
This commit is contained in:
offl
2021-11-07 22:51:25 +02:00
committed by Shauren
parent 791b759332
commit ebcd45b7e1
4 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/updates/world/master/2022_03_21_14_world_2021_11_07_03_world.sql Normal file
View File

@@ -0,0 +1,2 @@
--
UPDATE `smart_scripts` SET `action_param6` = 0 WHERE `action_type` = 53 AND `action_param6` = 3;

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

@@ -1420,9 +1420,6 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u
}
}
// Extra validation to ignore invalid values stored in the db, see comment at TEMPORARY_EXTRA_VALUE_FOR_DB_CLEANUP definition
if (e.action.wpStart.reactState <= REACT_AGGRESSIVE)
me->SetReactState((ReactStates)e.action.wpStart.reactState);
ENSURE_AI(SmartAI, me->AI())->StartPath(run, entry, repeat, unit);
uint32 quest = e.action.wpStart.quest;

10
src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
View File

@@ -1898,16 +1898,6 @@ bool SmartAIMgr::IsEventValid(SmartScriptHolder& e)
if (e.action.wpStart.quest && !IsQuestValid(e, e.action.wpStart.quest))
return false;
// Allow "invalid" value 3 for a while to allow cleanup the values stored in the db for SMART_ACTION_WP_START.
// Remember to remove this once the clean is complete.
constexpr uint32 TEMPORARY_EXTRA_VALUE_FOR_DB_CLEANUP = 1;
if (e.action.wpStart.reactState > (REACT_AGGRESSIVE + TEMPORARY_EXTRA_VALUE_FOR_DB_CLEANUP))
{
TC_LOG_ERROR("sql.sql", "SmartAIMgr: Creature " SI64FMTD " Event %u Action %u uses invalid React State %u, skipped.", e.entryOrGuid, e.event_id, e.GetActionType(), e.action.wpStart.reactState);
return false;
}
TC_SAI_IS_BOOLEAN_VALID(e, e.action.wpStart.run);
TC_SAI_IS_BOOLEAN_VALID(e, e.action.wpStart.repeat);
break;

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

@@ -501,7 +501,7 @@ enum SMART_ACTION
SMART_ACTION_SUMMON_GO = 50, // GameObjectID, DespawnTime in s
SMART_ACTION_KILL_UNIT = 51, //
SMART_ACTION_ACTIVATE_TAXI = 52, // TaxiID
SMART_ACTION_WP_START = 53, // run/walk, pathID, canRepeat, quest, despawntime, reactState
SMART_ACTION_WP_START = 53, // run/walk, pathID, canRepeat, quest, despawntime
SMART_ACTION_WP_PAUSE = 54, // time
SMART_ACTION_WP_STOP = 55, // despawnTime, quest, fail?
SMART_ACTION_ADD_ITEM = 56, // itemID, count
@@ -867,7 +867,7 @@ struct SmartAction
SAIBool repeat;
uint32 quest;
uint32 despawnTime;
uint32 reactState;
// uint32 reactState; DO NOT REUSE
} wpStart;
struct