From 8202dc28c2dae613c14a52ef4e84932d8c1c9e39 Mon Sep 17 00:00:00 2001 From: Edder Date: Sun, 25 Apr 2021 11:36:54 +0200 Subject: Core/Quest: Threat From Above (#26468) * [Quest] Threat From Above #26355 * [Quest] Threat From Above TrinityCore#26355 * Core/Quest: Threat From Above #26468 - modified sql according to guidelines; added override keyword * Rename 2021_04_24_00_world.sql to 2021_04_25_00_world.sql Co-authored-by: Edder Co-authored-by: Giacomo Pozzoni (cherry picked from commit 3e407c7d1c79cc94bf932880ee0eb68058d139fd) --- src/server/scripts/Spells/spell_generic.cpp | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'src/server/scripts/Spells') diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index b3803a8ffcc..08ae2ab112a 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -3695,6 +3695,31 @@ class spell_gen_eject_passenger : public SpellScript } }; +class spell_gen_eject_passenger_with_seatId : public SpellScript +{ + PrepareSpellScript(spell_gen_eject_passenger_with_seatId); + +public: + spell_gen_eject_passenger_with_seatId(uint8 seatId) : SpellScript(), _seatId(seatId) { } + +private: + uint8 _seatId; + + void EjectPassenger(SpellEffIndex /*effIndex*/) + { + if (Vehicle* vehicle = GetHitUnit()->GetVehicleKit()) + { + if (Unit* passenger = vehicle->GetPassenger(_seatId)) + passenger->ExitVehicle(); + } + } + + void Register() override + { + OnEffectHitTarget += SpellEffectFn(spell_gen_eject_passenger_with_seatId::EjectPassenger, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT); + } +}; + enum GMFreeze { SPELL_GM_FREEZE = 9454 @@ -4842,6 +4867,8 @@ void AddSC_generic_spell_scripts() RegisterSpellScript(spell_gen_whisper_gulch_yogg_saron_whisper); RegisterSpellScript(spell_gen_eject_all_passengers); RegisterSpellScript(spell_gen_eject_passenger); + RegisterSpellScriptWithArgs(spell_gen_eject_passenger_with_seatId, "spell_gen_eject_passenger_1", 0); + RegisterSpellScriptWithArgs(spell_gen_eject_passenger_with_seatId, "spell_gen_eject_passenger_3", 2); RegisterSpellScript(spell_gen_gm_freeze); RegisterSpellScript(spell_gen_stand); RegisterSpellScript(spell_gen_mixology_bonus); -- cgit v1.2.3