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

fix(Scripts/BlackTemple): blade_of_azzinoth...and Possible crash (#19891)

Browse Source 
* Update boss_illidan.cpp

* Update boss_illidan.cpp
This commit is contained in:
天鹿
2024-09-07 18:05:18 +08:00
committed by GitHub
parent e7448f2986
commit dc4c874206
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
View File

@@ -1209,7 +1209,10 @@ enum WarbladeTear
struct npc_blade_of_azzinoth : public ScriptedAI struct npc_blade_of_azzinoth : public ScriptedAI
{ {
npc_blade_of_azzinoth(Creature* creature) : ScriptedAI(creature) { } npc_blade_of_azzinoth(Creature* creature) : ScriptedAI(creature)
{
me->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE);
}
void IsSummonedBy(WorldObject* /*summoner*/) override void IsSummonedBy(WorldObject* /*summoner*/) override
{ {
@@ -1257,12 +1260,13 @@ enum FlameAzzinoth
struct npc_flame_of_azzinoth : public ScriptedAI struct npc_flame_of_azzinoth : public ScriptedAI
{ {
npc_flame_of_azzinoth(Creature* creature) : ScriptedAI(creature), _bladeSummoner(nullptr) { } npc_flame_of_azzinoth(Creature* creature) : ScriptedAI(creature) { }
void IsSummonedBy(WorldObject* /*summoner*/) override void IsSummonedBy(WorldObject* /*summoner*/) override
{ {
// Flame is set to be Illidan's summon, so we check for nearest blade // Flame is set to be Illidan's summon, so we check for nearest blade
_bladeSummoner = me->FindNearestCreature(NPC_BLADE_OF_AZZINOTH, 15.0f); if (Creature* _blade = me->FindNearestCreature(NPC_BLADE_OF_AZZINOTH, 15.0f))
_bladeGUID = _blade->GetGUID();
me->SetCorpseDelay(2); me->SetCorpseDelay(2);
me->SetReactState(REACT_DEFENSIVE); me->SetReactState(REACT_DEFENSIVE);
@@ -1285,8 +1289,8 @@ struct npc_flame_of_azzinoth : public ScriptedAI
void JustEngagedWith(Unit* /*who*/) override void JustEngagedWith(Unit* /*who*/) override
{ {
ScheduleTimedEvent(10s, [&] { ScheduleTimedEvent(10s, [&] {
if (_bladeSummoner) if (Creature* _blade = ObjectAccessor::GetCreature(*me, _bladeGUID))
if (Unit* target = _bladeSummoner->AI()->SelectTarget(SelectTargetMethod::Random, 0, 30.f, true)) if (Unit* target = _blade->AI()->SelectTarget(SelectTargetMethod::Random, 0, 30.0f, true))
DoCast(target, SPELL_CHARGE); DoCast(target, SPELL_CHARGE);
}, 5s, 20s); }, 5s, 20s);
@@ -1301,7 +1305,7 @@ struct npc_flame_of_azzinoth : public ScriptedAI
} }
private: private:
Creature* _bladeSummoner; ObjectGuid _bladeGUID;
}; };
class spell_illidan_draw_soul : public SpellScript class spell_illidan_draw_soul : public SpellScript