From d4e419bf8da3a141c11491a5bd38147bb7503693 Mon Sep 17 00:00:00 2001 From: avarishd <46330494+avarishd@users.noreply.github.com> Date: Fri, 30 May 2025 17:30:46 +0300 Subject: [PATCH] =?UTF-8?q?fix(Scripts/AhnKahet):=20Ahn'kahar=20Spell=20Fl?= =?UTF-8?q?inger=20failing=20to=20channel=20S=E2=80=A6=20(#22082)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pending_db_world/rev_1746721372812798600.sql | 2 ++ .../scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h | 2 +- .../AzjolNerub/ahnkahet/instance_ahnkahet.cpp | 10 +++++++--- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1746721372812798600.sql diff --git a/data/sql/updates/pending_db_world/rev_1746721372812798600.sql b/data/sql/updates/pending_db_world/rev_1746721372812798600.sql new file mode 100644 index 000000000..be29dcaa9 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1746721372812798600.sql @@ -0,0 +1,2 @@ +-- +UPDATE `smart_scripts` SET `action_param2` = 64 WHERE `entryorguid` = 30278 AND `source_type` = 0 AND `id` IN (2,3); diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h index 2add3a842..b6b691be6 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h @@ -48,7 +48,7 @@ enum AhnKahetCreatures enum AhnkahetSpells { - SPELL_SHADOW_SICKLE = 56701, // Shadow Sickle Normal + SPELL_SHADOW_SICKLE = 56701, // Shadow Sickle }; enum AhnkahetObjects diff --git a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp index ce048a9a1..f0c56bc78 100644 --- a/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp +++ b/src/server/scripts/Northrend/AzjolNerub/ahnkahet/instance_ahnkahet.cpp @@ -133,15 +133,19 @@ public: } }; -// 56702 Shadow Sickle -// 59103 Shadow Sickle +// 56702, 59103 - Shadow Sickle class spell_shadow_sickle_periodic_damage : public AuraScript { PrepareAuraScript(spell_shadow_sickle_periodic_damage); void HandlePeriodic(AuraEffect const* /*aurEff*/) { - GetCaster()->CastSpell(nullptr, SPELL_SHADOW_SICKLE); + Unit* caster = GetCaster(); + if (!caster->IsCreature()) + return; + + if (Unit* target = caster->GetAI()->SelectTarget(SelectTargetMethod::Random, 0, 40.0f)) // Unknown if it targets only players + caster->CastSpell(target, SPELL_SHADOW_SICKLE, true); } void Register() override