public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 15:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Scripts/Midsummer): use GUID storage rather than Player object (#19109)

Browse Source 
* Update midsummer.cpp

* Update midsummer.cpp

* Update midsummer.cpp
This commit is contained in:
天鹿
2024-06-21 21:45:56 +08:00
committed by GitHub
parent 6d819b51d8
commit 680c219770
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/server/scripts/Events/midsummer.cpp
View File

@@ -676,10 +676,10 @@ struct npc_midsummer_ribbon_pole_target : public ScriptedAI
} }
// prevent duplicates // prevent duplicates
if (std::find(_dancerList.begin(), _dancerList.end(), dancer) != _dancerList.end()) if (std::find(_dancerList.begin(), _dancerList.end(), dancer->GetGUID()) != _dancerList.end())
return; return;
_dancerList.push_back(dancer); _dancerList.push_back(dancer->GetGUID());
} }
void LocateRibbonPole() void LocateRibbonPole()
@@ -707,11 +707,11 @@ struct npc_midsummer_ribbon_pole_target : public ScriptedAI
return; return;
// remove non-dancing players from list // remove non-dancing players from list
std::erase_if(_dancerList, [](Player* dancer) std::erase_if(_dancerList, [this](ObjectGuid dancerGUID)
{ {
if (dancer) /// @todo: replace with GUID storage rather than Player object Player* dancer = ObjectAccessor::GetPlayer(*me, dancerGUID);
return !dancer->HasAura(SPELL_RIBBON_POLE_PERIODIC_VISUAL); return !dancer || !dancer->HasAura(SPELL_RIBBON_POLE_PERIODIC_VISUAL);
}); });
} }
void DoFlameCircleChecks() void DoFlameCircleChecks()
@@ -789,9 +789,7 @@ struct npc_midsummer_ribbon_pole_target : public ScriptedAI
for (uint8 i = 0; (i < MAX_COUNT_SPEW_LAVA_TARGETS) && (i < _dancerList.size()); i++) for (uint8 i = 0; (i < MAX_COUNT_SPEW_LAVA_TARGETS) && (i < _dancerList.size()); i++)
{ {
Player* dancerTarget = _dancerList[i]; if (Player* dancerTarget = ObjectAccessor::GetPlayer(*me, _dancerList[i]))
if (dancerTarget)
{ {
Creature* fireSpiralBunny = dancerTarget->SummonCreature(NPC_RIBBON_POLE_FIRE_SPIRAL_BUNNY, dancerTarget->GetPositionX(), dancerTarget->GetPositionY(), dancerTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 10000); Creature* fireSpiralBunny = dancerTarget->SummonCreature(NPC_RIBBON_POLE_FIRE_SPIRAL_BUNNY, dancerTarget->GetPositionX(), dancerTarget->GetPositionY(), dancerTarget->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 10000);
if (fireSpiralBunny) if (fireSpiralBunny)
@@ -824,7 +822,7 @@ struct npc_midsummer_ribbon_pole_target : public ScriptedAI
} }
private: private:
std::vector<Player*> _dancerList; GuidVector _dancerList;
GameObject* _ribbonPole; GameObject* _ribbonPole;
Creature* _bunny; Creature* _bunny;
}; };