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

Revert "Merge branch 'ElunaLuaEngine:master' into master"

Browse Source 
This reverts commit f9d57429d6, reversing
changes made to ccf337262c.
This commit is contained in:
55Honey
2021-11-23 21:31:32 +01:00
parent f9d57429d6
commit 2de122c4f4
2 changed files with 59 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
CreatureMethods.h
View File

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