From bef302fc7e3ef60091bd71cc3316d7bc4fdd83df Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Fri, 26 Mar 2021 18:26:06 +0100 Subject: [PATCH] Scripts/Deepholm: corrected casting of the intro taxi when entering Deepholm --- .../world/4.3.4/2021_03_26_00_world.sql | 5 +++++ .../scripts/Maelstrom/zone_deepholm.cpp | 21 ------------------- 2 files changed, 5 insertions(+), 21 deletions(-) create mode 100644 sql/updates/world/4.3.4/2021_03_26_00_world.sql diff --git a/sql/updates/world/4.3.4/2021_03_26_00_world.sql b/sql/updates/world/4.3.4/2021_03_26_00_world.sql new file mode 100644 index 00000000000..cf32f07dec5 --- /dev/null +++ b/sql/updates/world/4.3.4/2021_03_26_00_world.sql @@ -0,0 +1,5 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`= 'spell_deepholm_intro_teleport'; + +DELETE FROM `spell_area` WHERE `spell`= 84101; +INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spell`, `racemask`, `gender`, `flags`, `quest_start_status`, `quest_end_status`) VALUES +(84101, 5042, 0, 0, 84073, 0, 2, 0x1, 64, 11); diff --git a/src/server/scripts/Maelstrom/zone_deepholm.cpp b/src/server/scripts/Maelstrom/zone_deepholm.cpp index 8880dfd7f14..70e3b8d4142 100644 --- a/src/server/scripts/Maelstrom/zone_deepholm.cpp +++ b/src/server/scripts/Maelstrom/zone_deepholm.cpp @@ -171,7 +171,6 @@ enum DeepholmTheRealmOfEarth SPELL_CAMERA_1 = 84364, SPELL_FORCECAST_AGGRA_PING = 96123, SPELL_FORCECAST_TELEPORT = 84093, - SPELL_DEEPHOLM_INTRO_TAXI = 84101, SPELL_EJECT_PASSENGER_2 = 62539, // Events @@ -284,29 +283,9 @@ class spell_deepholm_twilight_buffet_targeting : public SpellScript } }; -// 84073 - Deepholm Intro Teleport -class spell_deepholm_intro_teleport : public AuraScript -{ - bool Validate(SpellInfo const* /*spellInfo*/) override - { - return ValidateSpellInfo({ SPELL_DEEPHOLM_INTRO_TAXI }); - } - - void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) - { - GetTarget()->CastSpell(GetTarget(), SPELL_DEEPHOLM_INTRO_TAXI); - } - - void Register() override - { - AfterEffectRemove.Register(&spell_deepholm_intro_teleport::HandleRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL); - } -}; - void AddSC_deepholm() { RegisterCreatureAI(npc_deepholm_xariona); RegisterCreatureAI(npc_deepholm_wyvern); RegisterSpellScript(spell_deepholm_twilight_buffet_targeting); - RegisterSpellScript(spell_deepholm_intro_teleport); }