azerothcore/mod-ale
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Combat): Update to new ThreatManager API (#361)

Browse Source 
Co-authored-by: blinkysc <blinkysc@users.noreply.github.com>
Co-authored-by: iThorgrim <125808072+iThorgrim@users.noreply.github.com>
This commit is contained in:
blinkysc
2026-03-18 13:45:41 -05:00
committed by GitHub
parent f31dbd03c6
commit 9ecb0f6d10
2 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/LuaEngine/methods/CreatureMethods.h
View File

@@ -649,18 +649,18 @@ namespace LuaCreature
float dist = ALE::CHECKVAL<float>(L, 5, 0.0f);
int32 aura = ALE::CHECKVAL<int32>(L, 6, 0);
auto const& threatlist = creature->GetThreatMgr().GetThreatList();
ThreatManager const& threatMgr = creature->GetThreatMgr();
if (threatlist.empty())
if (threatMgr.IsThreatListEmpty())
return 1;
if (position >= threatlist.size())
if (position >= threatMgr.GetThreatListSize())
return 1;
std::list<Unit*> targetList;
for (auto itr = threatlist.begin(); itr != threatlist.end(); ++itr)
for (ThreatReference const* ref : threatMgr.GetSortedThreatList())
{
Unit* target = (*itr)->getTarget();
Unit* target = ref->GetVictim();
if (!target)
continue;
@@ -730,19 +730,14 @@ namespace LuaCreature
*/
int GetAITargets(lua_State* L, Creature* creature)
{
auto const& threatlist = creature->GetThreatMgr().GetThreatList();
ThreatManager const& threatMgr = creature->GetThreatMgr();
lua_createtable(L, threatlist.size(), 0);
lua_createtable(L, threatMgr.GetThreatListSize(), 0);
int tbl = lua_gettop(L);
uint32 i = 0;
for (auto itr = threatlist.begin(); itr != threatlist.end(); ++itr)
for (ThreatReference const* ref : threatMgr.GetSortedThreatList())
{
Unit* target = (*itr)->getTarget();
if (!target)
continue;
ALE::Push(L, target);
ALE::Push(L, ref->GetVictim());
lua_rawseti(L, tbl, ++i);
}

8
src/LuaEngine/methods/UnitMethods.h
View File

@@ -1885,17 +1885,11 @@ namespace LuaUnit
return 1;
}
ThreatContainer::StorageType const& list = unit->GetThreatMgr().GetThreatList();
lua_newtable(L);
int table = lua_gettop(L);
uint32 i = 1;
for (ThreatReference* item : list)
for (ThreatReference const* item : unit->GetThreatMgr().GetSortedThreatList())
{
if (!item)
{
continue;
}
Unit* victim = item->GetVictim();
if (!victim)
{