yolinlin/mod-ale
1
0
Fork 0
mirror of https://github.com/azerothcore/mod-ale synced 2025-11-29 15:38:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix GetAITargets and GetAITargetsCount for TC

Browse Source 
These really need to be rewritten at some point, define hell
This commit is contained in:
Foereaper
2021-11-23 00:56:26 +01:00
committed by GitHub
parent fd89ca0e77
commit 850be61d97
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
CreatureMethods.h
View File

@@ -858,19 +858,28 @@ namespace LuaCreature
int GetAITargets(lua_State* L, Creature* creature) int GetAITargets(lua_State* L, Creature* creature)
{ {
#if defined(TRINITY) #if defined(TRINITY)
auto const& threatlist = creature->GetThreatManager().GetThreatenedByMeList(); auto const& threatlist = creature->GetThreatManager().GetSortedThreatList();
#elif defined(AZEROTHCORE) #elif defined(AZEROTHCORE)
auto const& threatlist = creature->getThreatMgr().getThreatList(); auto const& threatlist = creature->getThreatMgr().getThreatList();
#else #else
ThreatList const& threatlist = creature->GetThreatManager().getThreatList(); ThreatList const& threatlist = creature->GetThreatManager().getThreatList();
#endif #endif
#if defined(TRINITY)
lua_createtable(L, creature->GetThreatManager().GetThreatListSize(), 0);
#else
lua_createtable(L, threatlist.size(), 0); lua_createtable(L, threatlist.size(), 0);
#endif
int tbl = lua_gettop(L); int tbl = lua_gettop(L);
uint32 i = 0; uint32 i = 0;
#if defined(TRINITY)
for (ThreatReference const* itr : threatlist)
#else
for (auto itr = threatlist.begin(); itr != threatlist.end(); ++itr) for (auto itr = threatlist.begin(); itr != threatlist.end(); ++itr)
#endif
{ {
#if defined(TRINITY) #if defined(TRINITY)
Unit* target = itr->second->GetOwner(); Unit* target = itr->GetVictim();
#else #else
Unit* target = (*itr)->getTarget(); Unit* target = (*itr)->getTarget();
#endif #endif
@@ -892,7 +901,7 @@ auto const& threatlist = creature->getThreatMgr().getThreatList();
int GetAITargetsCount(lua_State* L, Creature* creature) int GetAITargetsCount(lua_State* L, Creature* creature)
{ {
#if defined(TRINITY) #if defined(TRINITY)
Eluna::Push(L, creature->GetThreatManager().GetThreatenedByMeList().size()); Eluna::Push(L, creature->GetThreatManager().GetThreatListSize());
#elif defined(AZEROTHCORE) #elif defined(AZEROTHCORE)
Eluna::Push(L, creature->getThreatMgr().getThreatList().size()); Eluna::Push(L, creature->getThreatMgr().getThreatList().size());
#else #else