nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-05 03:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Scripts/MoltenCore): Ensure Majordomo minions that completely despawned respawn on wipes (#10061)

Browse Source
This commit is contained in:
Skjalf
2022-01-08 07:31:37 -03:00
committed by GitHub
parent 725b1266b4
commit 0e29319d8f
1 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
View File

@@ -121,6 +121,15 @@ Position const MajordomoSummonPos = {759.542f, -1173.43f, -118.974f, 3.3048f };
Position const MajordomoMoveRagPos = { 830.9636f, -814.7055f, -228.9733f, 0.0f }; // Position used at Ragnaros summoning event Position const MajordomoMoveRagPos = { 830.9636f, -814.7055f, -228.9733f, 0.0f }; // Position used at Ragnaros summoning event
Position const RagnarosSummonPos = { 838.3082f, -831.4665f, -232.1853f, 2.199115f }; Position const RagnarosSummonPos = { 838.3082f, -831.4665f, -232.1853f, 2.199115f };
struct MajordomoAddData
{
ObjectGuid guid;
uint32 creatureEntry;
Position spawnPos;
MajordomoAddData(ObjectGuid _guid, uint32 _creatureEntry, Position _spawnPos) : guid(_guid), creatureEntry(_creatureEntry), spawnPos(_spawnPos) { }
};
class boss_majordomo : public CreatureScript class boss_majordomo : public CreatureScript
{ {
public: public:
@@ -163,6 +172,7 @@ public:
if (summon) if (summon)
{ {
static_minionsGUIDS.insert(summon->GetGUID()); static_minionsGUIDS.insert(summon->GetGUID());
majordomoSummonsData.push_back(MajordomoAddData(summon->GetGUID(), summon->GetEntry(), summon->GetPosition()));
} }
} }
} }
@@ -186,10 +196,26 @@ public:
{ {
events.SetPhase(PHASE_COMBAT); events.SetPhase(PHASE_COMBAT);
instance->SetBossState(DATA_MAJORDOMO_EXECUTUS, NOT_STARTED); instance->SetBossState(DATA_MAJORDOMO_EXECUTUS, NOT_STARTED);
for (auto summon : majordomoSummonsData)
{
if (ObjectAccessor::GetCreature(*me, summon.guid))
{
continue;
}
if (Creature* spawn = me->SummonCreature(summon.creatureEntry, summon.spawnPos))
{
static_minionsGUIDS.erase(summon.guid); // Erase the guid from the previous, no longer existing, spawn.
static_minionsGUIDS.insert(spawn->GetGUID());
summon.guid = spawn->GetGUID();
}
}
} }
else else
{ {
static_minionsGUIDS.clear(); static_minionsGUIDS.clear();
majordomoSummonsData.clear();
summons.DespawnAll(); summons.DespawnAll();
} }
} }
@@ -495,6 +521,7 @@ public:
private: private:
GuidSet static_minionsGUIDS; // contained data should be changed on encounter completion GuidSet static_minionsGUIDS; // contained data should be changed on encounter completion
GuidSet aliveMinionsGUIDS; // used for calculations GuidSet aliveMinionsGUIDS; // used for calculations
std::list<MajordomoAddData> majordomoSummonsData;
}; };
bool OnGossipHello(Player* player, Creature* creature) override bool OnGossipHello(Player* player, Creature* creature) override