From 4bd780b464d17b4b041730986decf86a8255e6a5 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Wed, 14 Sep 2022 01:33:37 +0200 Subject: Scripts/HoO: fixed a crash in Temple Guardian Anhuur's script due to now supporting gameobject casters (cherry picked from commit 3203f04ac1064d0812e3bcad12d0c25dc2e31593) --- .../HallsOfOrigination/boss_temple_guardian_anhuur.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp index e583613e6ae..6ce792b6e21 100644 --- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp +++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp @@ -325,9 +325,14 @@ class spell_anhuur_disable_beacon_beams : public SpellScriptLoader void Notify(SpellEffIndex /*index*/) { - if (InstanceScript* const script = GetCaster()->GetInstanceScript()) - if (Creature* anhuur = ObjectAccessor::GetCreature(*GetCaster(), script->GetGuidData(DATA_ANHUUR_GUID))) - anhuur->AI()->DoAction(ACTION_DISABLE_BEACON); + GameObject* caster = GetGObjCaster(); + if (!caster) + return; + + if (InstanceScript* instance = caster->GetInstanceScript()) + if (Creature* anhuur = instance->GetCreature(DATA_TEMPLE_GUARDIAN_ANHUUR)) + if (CreatureAI* ai = anhuur->AI()) + ai->DoAction(ACTION_DISABLE_BEACON); } void Register() override -- cgit v1.2.3