diff options
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp | 11 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_generic.cpp | 7 |
2 files changed, 0 insertions, 18 deletions
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp index 4669b953241..ffb878bd19f 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_kologarn.cpp @@ -426,20 +426,9 @@ class spell_ulduar_stone_grip_cast_target : public SpellScriptLoader unitList = m_unitList; } - void HandleForceCast(SpellEffIndex i) - { - Player* player = GetHitPlayer(); - if (!player) - return; - - player->CastSpell(GetTargetUnit(), GetSpellInfo()->EffectTriggerSpell[i], true); // Don't send m_originalCasterGUID param here or underlying - PreventHitEffect(i); // AureEffect::HandleAuraControlVehicle will fail on caster == target - } - void Register() { OnUnitTargetSelect += SpellUnitTargetFn(spell_ulduar_stone_grip_cast_target_SpellScript::FilterTargetsInitial, EFFECT_0, TARGET_UNIT_AREA_ENEMY_SRC); - OnEffect += SpellEffectFn(spell_ulduar_stone_grip_cast_target_SpellScript::HandleForceCast, EFFECT_0, SPELL_EFFECT_FORCE_CAST); OnUnitTargetSelect += SpellUnitTargetFn(spell_ulduar_stone_grip_cast_target_SpellScript::FillTargetsSubsequential, EFFECT_1, TARGET_UNIT_AREA_ENEMY_SRC); OnUnitTargetSelect += SpellUnitTargetFn(spell_ulduar_stone_grip_cast_target_SpellScript::FillTargetsSubsequential, EFFECT_2, TARGET_UNIT_AREA_ENEMY_SRC); } diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index fbe890a41c4..41c7a3898de 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -1170,15 +1170,8 @@ class spell_gen_launch : public SpellScriptLoader void HandleScript(SpellEffIndex effIndex) { - PreventHitDefaultEffect(effIndex); - - SpellEntry const* const spell = GetSpellInfo(); - if (Player* player = GetHitPlayer()) - { - player->CastSpell(player,spell->EffectTriggerSpell[1],true); // changes the player's seat player->AddAura(SPELL_LAUNCH_NO_FALLING_DAMAGE,player); // prevents falling damage - } } void Launch() |