diff --git a/data/sql/updates/pending_db_world/rev_1790862253927946155.sql b/data/sql/updates/pending_db_world/rev_1790862253927946155.sql new file mode 100644 index 0000000000..4aa71cbeb4 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1790862253927946155.sql @@ -0,0 +1,7 @@ +-- +-- Prevent cone cast of Scorch targeting players in Ignis' Slag Pot +DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 13) AND (`SourceGroup` = 1) AND (`SourceEntry` IN (62549, 62553, 63475)) AND (`SourceId` = 0) AND (`ElseGroup` = 0); +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(13, 1, 62549, 0, 0, 1, 0, 62717, 1, 0, 1, 0, 0, '', 'target must not have aura \'Slag Pot\''), +(13, 1, 62553, 0, 0, 1, 0, 62717, 1, 0, 1, 0, 0, '', 'target must not have aura \'Slag Pot\''), +(13, 1, 63475, 0, 0, 1, 0, 62717, 1, 0, 1, 0, 0, '', 'target must not have aura \'Slag Pot\''); diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index e5ce68a1a6..843a283de0 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -439,8 +439,6 @@ class spell_ignis_grab_initial : public SpellScript enum SlagPot { SPELL_SLAG_POT_DAMAGE = 65722, - SPELL_SCORCH_DAMAGE_1 = 62549, - SPELL_SCORCH_DAMAGE_2 = 63475, SPELL_SLAG_IMBUED = 62836, }; @@ -453,8 +451,6 @@ class spell_ignis_slag_pot_aura : public AuraScript return ValidateSpellInfo( { SPELL_SLAG_POT_DAMAGE, - SPELL_SCORCH_DAMAGE_1, - SPELL_SCORCH_DAMAGE_2, SPELL_SLAG_IMBUED }); } @@ -466,21 +462,10 @@ class spell_ignis_slag_pot_aura : public AuraScript caster->CastSpell(target, SPELL_SLAG_POT_DAMAGE, true); } - void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) - { - if (Unit* target = GetTarget()) - { - target->ApplySpellImmune(GetId(), IMMUNITY_ID, SPELL_SCORCH_DAMAGE_1, true); - target->ApplySpellImmune(GetId(), IMMUNITY_ID, SPELL_SCORCH_DAMAGE_2, true); - } - } - void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* target = GetTarget()) { - target->ApplySpellImmune(GetId(), IMMUNITY_ID, SPELL_SCORCH_DAMAGE_1, false); - target->ApplySpellImmune(GetId(), IMMUNITY_ID, SPELL_SCORCH_DAMAGE_2, false); if (target->IsAlive()) target->CastSpell(target, SPELL_SLAG_IMBUED, true); } @@ -489,7 +474,6 @@ class spell_ignis_slag_pot_aura : public AuraScript void Register() override { OnEffectPeriodic += AuraEffectPeriodicFn(spell_ignis_slag_pot_aura::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY); - OnEffectApply += AuraEffectApplyFn(spell_ignis_slag_pot_aura::OnApply, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); AfterEffectRemove += AuraEffectRemoveFn(spell_ignis_slag_pot_aura::OnRemove, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY, AURA_EFFECT_HANDLE_REAL); } };