diff options
| author | Sorikoff <46191832+Sorikoff@users.noreply.github.com> | 2019-06-29 11:35:11 +0000 |
|---|---|---|
| committer | Giacomo Pozzoni <giacomopoz@gmail.com> | 2019-06-29 13:35:11 +0200 |
| commit | 8d1a5fa1266dc98438cabfb1ced7891791245ff0 (patch) | |
| tree | b79ff8499dbb7871f98eb3cb59fa9b51e4fba89e | |
| parent | eb7a6391aafa5e618b2a565f0c2cfc2516dcee7e (diff) | |
Scripts/Spells: Remove Collapsing Cave Aura (#23533)
* Scripts/Spells: Remove Collapsing Cave Aura
* Rename 9999_99_99_99_world.sql to 2019_06_29_00_world.sql
| -rw-r--r-- | sql/updates/world/3.3.5/2019_06_29_00_world.sql | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 5 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/zone_storm_peaks.cpp | 22 |
3 files changed, 24 insertions, 5 deletions
diff --git a/sql/updates/world/3.3.5/2019_06_29_00_world.sql b/sql/updates/world/3.3.5/2019_06_29_00_world.sql new file mode 100644 index 00000000000..be171cc208f --- /dev/null +++ b/sql/updates/world/3.3.5/2019_06_29_00_world.sql @@ -0,0 +1,2 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_q12823_remove_collapsing_cave_aura'; +INSERT INTO `spell_script_names` VALUES (55693,'spell_q12823_remove_collapsing_cave_aura'); diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 7e52f85aa42..b916528e5f6 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -3495,11 +3495,6 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) { switch (m_spellInfo->Id) { - case 55693: // Remove Collapsing Cave Aura - if (!unitTarget) - return; - unitTarget->RemoveAurasDueToSpell(m_spellInfo->Effects[effIndex].CalcValue()); - break; // Brittle Armor - need remove one 24575 Brittle Armor aura case 24590: unitTarget->RemoveAuraFromStack(24575); diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index a72c266ef39..86e7a9c6bfd 100644 --- a/src/server/scripts/Northrend/zone_storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp @@ -1436,6 +1436,27 @@ class spell_player_mount_wyrm : public SpellScriptLoader } }; +enum CollapsingCave +{ + SPELL_COLLAPSING_CAVE = 55486 +}; + +// 55693 - Remove Collapsing Cave Aura +class spell_q12823_remove_collapsing_cave_aura : public SpellScript +{ + PrepareSpellScript(spell_q12823_remove_collapsing_cave_aura); + + void HandleScriptEffect(SpellEffIndex /* effIndex */) + { + GetHitUnit()->RemoveAurasDueToSpell(SPELL_COLLAPSING_CAVE); + } + + void Register() override + { + OnEffectHitTarget += SpellEffectFn(spell_q12823_remove_collapsing_cave_aura::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } +}; + void AddSC_storm_peaks() { new npc_injured_goblin(); @@ -1461,4 +1482,5 @@ void AddSC_storm_peaks() new spell_fatal_strike(); new spell_falling_dragon_feign_death(); new spell_player_mount_wyrm(); + RegisterSpellScript(spell_q12823_remove_collapsing_cave_aura); } |