sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

фиксы обновления

Browse Source
This commit is contained in:
sindoring
2026-08-02 20:25:03 +04:00
parent aa95d99b18
commit 4b88e1f171
11 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/mod-eluna/src/ElunaLuaEngine_SC.cpp
+2 -2
View File
@@ -635,7 +635,7 @@ public:
PLAYERHOOK_CAN_RESURRECT
}) { }
void OnPlayerResurrect(Player* player, float /*restore_percent*/, bool /*applySickness*/) override
void OnPlayerResurrect(Player* player, float /*restore_percent*/, bool& /*applySickness*/) override
{
sEluna->OnResurrect(player);
}
@@ -959,7 +959,7 @@ public:
SERVERHOOK_CAN_PACKET_RECEIVE
}) { }
bool CanPacketSend(WorldSession* session, WorldPacket& packet) override
bool CanPacketSend(WorldSession* session, WorldPacket const& packet) override
{
if (!sEluna->OnPacketSend(session, packet))
return false;
modules/mod-eluna/src/LuaEngine/methods/CreatureMethods.h
+9 -9
View File
@@ -649,18 +649,18 @@ namespace LuaCreature
float dist = Eluna::CHECKVAL<float>(L, 5, 0.0f);
int32 aura = Eluna::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,14 +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();
Unit* target = ref->GetVictim();
if (!target)
continue;
modules/mod-eluna/src/LuaEngine/methods/UnitMethods.h
+1 -3
View File
@@ -1902,12 +1902,10 @@ 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)
{