diff options
| author | offl <11556157+offl@users.noreply.github.com> | 2022-02-22 23:53:37 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-26 15:20:10 +0100 |
| commit | d86bc562cbc62a526f4c54ec70d2c134eb04c4c7 (patch) | |
| tree | f952fd42752ae939e15606f5f8221a35c7740318 /src/server/scripts/Outland | |
| parent | 1bb63f69ef12d572a34f6ed107a5d6008c7da5e2 (diff) | |
Scripts/Misc: Adjustments to previous fixes (#27821)
(cherry picked from commit 9ee6f4fb115d177d907ab48a9f9c5f39ba239046)
Diffstat (limited to 'src/server/scripts/Outland')
3 files changed, 9 insertions, 8 deletions
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp index 2663b3f2dba..81e2624aad4 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp @@ -1365,8 +1365,8 @@ class spell_kaelthas_flame_strike : public AuraScript void AfterRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { - if (Unit* target = GetTarget()) - target->CastSpell(target, SPELL_FLAME_STRIKE_DAMAGE); + Unit* target = GetTarget(); + target->CastSpell(target, SPELL_FLAME_STRIKE_DAMAGE); } void Register() override @@ -1387,14 +1387,14 @@ class spell_kaelthas_summon_weapons : public SpellScript void HandleScript(SpellEffIndex /*effIndex*/) { - if (Unit* caster = GetCaster()) - for (uint32 spells : SummonWeaponsSpells) - caster->CastSpell(caster, spells, true); + Unit* caster = GetCaster(); + for (uint32 spells : SummonWeaponsSpells) + caster->CastSpell(caster, spells, true); } void Register() override { - OnEffectHitTarget += SpellEffectFn(spell_kaelthas_summon_weapons::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHit += SpellEffectFn(spell_kaelthas_summon_weapons::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); } }; diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp index 55484501a3a..833df956b12 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_laj.cpp @@ -74,7 +74,8 @@ struct boss_laj : public BossAI void JustSummoned(Creature* summon) override { // Not entirely correct, they aggro on their own in a weird way and in general behave weirdly - summon->AI()->AttackStart(SelectTarget(SelectTargetMethod::Random, 0)); + if (me->IsEngaged()) + DoZoneInCombat(summon); } void UpdateAI(uint32 diff) override diff --git a/src/server/scripts/Outland/zone_netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index ee34faf192e..462e9a188d0 100644 --- a/src/server/scripts/Outland/zone_netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp @@ -495,7 +495,7 @@ class spell_detonate_teleporter : public SpellScript void HandleScript(SpellEffIndex /*effIndex*/) { - if (Unit* creature = GetHitCreature()) + if (Creature* creature = GetHitCreature()) { if (Unit* charmer = GetCaster()->GetCharmerOrOwner()) { |