Scripts/Misc: resolved cherrypick issues and regressions

sql/updates/world/4.3.4/2021_12_31_00_world.sql

@@ -0,0 +1,6 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`= 'spell_conclave_of_wind_wind_blast_effect';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(85483, 'spell_conclave_of_wind_wind_blast_effect'),
+(93138, 'spell_conclave_of_wind_wind_blast_effect'),
+(93139, 'spell_conclave_of_wind_wind_blast_effect'),
+(93140, 'spell_conclave_of_wind_wind_blast_effect');

src/server/game/Spells/SpellMgr.cpp

@@ -5223,17 +5223,6 @@ void SpellMgr::LoadSpellInfoCorrections()
         spellInfo->Effects[EFFECT_0].RadiusEntry = sSpellRadiusStore.LookupEntry(EFFECT_RADIUS_3_YARDS);
     });
 
-    // Wind Blast
-    ApplySpellFix({
-        85483,
-        93138,
-        93139,
-        93140
-    }, [](SpellInfo* spellInfo)
-    {
-        spellInfo->Effects[EFFECT_1].TargetA = SpellImplicitTargetInfo(TARGET_UNIT_CONE_ENEMY_104);
-    });
-
     // Al'Akir
 
     // Wind Burst

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_omnotron_defense_system.cpp

@@ -1554,7 +1554,7 @@ class spell_omnotron_flamethrower : public SpellScript
 
     void Register() override
     {
-        OnObjectAreaTargetSelect.Register(&spell_omnotron_flamethrower::FilterTargets, EFFECT_0, TARGET_UNIT_CONE_ENEMY_104);
+        OnObjectAreaTargetSelect.Register(&spell_omnotron_flamethrower::FilterTargets, EFFECT_0, TARGET_UNIT_CONE_CASTER_TO_DEST_ENEMY);
     }
 };
 

src/server/scripts/EasternKingdoms/zone_hillsbrad_foothills.cpp

@@ -1287,7 +1287,7 @@ class spell_brazie_spit : public SpellScript
 
     void Register() override
     {
-        OnObjectAreaTargetSelect.Register(&spell_brazie_spit::FilterTargets, EFFECT_ALL, TARGET_UNIT_CONE_ENEMY_104);
+        OnObjectAreaTargetSelect.Register(&spell_brazie_spit::FilterTargets, EFFECT_ALL, TARGET_UNIT_CONE_CASTER_TO_DEST_ENEMY);
     }
 };
 

src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_conclave_of_wind.cpp

@@ -1193,6 +1193,28 @@ class spell_conclave_of_wind_wind_blast_triggered : public SpellScript
     }
 };
 
+class spell_conclave_of_wind_wind_blast_effect : public SpellScript
+{
+    void CopyTargets(std::list<WorldObject*>& targets)
+    {
+        _targets = targets;
+    }
+
+    void StoreTargets(std::list<WorldObject*>& targets)
+    {
+        targets = _targets;
+    }
+
+    void Register() override
+    {
+        OnObjectAreaTargetSelect.Register(&spell_conclave_of_wind_wind_blast_effect::CopyTargets, EFFECT_0, TARGET_UNIT_CONE_CASTER_TO_DEST_ENEMY);
+        OnObjectAreaTargetSelect.Register(&spell_conclave_of_wind_wind_blast_effect::StoreTargets, EFFECT_1, TARGET_UNIT_CONE_CASTER_TO_DEST_ENTRY);
+    }
+
+private:
+    std::list<WorldObject*> _targets;
+};
+
 class spell_conclave_of_wind_hurricane : public SpellScript
 {
     bool Validate(SpellInfo const* /*spellInfo*/) override
@@ -1284,6 +1306,7 @@ void AddSC_boss_conclave_of_wind()
     RegisterSpellScript(spell_conclave_of_wind_winds);
     RegisterSpellAndAuraScriptPair(spell_conclave_of_wind_wind_blast, spell_conclave_of_wind_wind_blast_AuraScript);
     RegisterSpellScript(spell_conclave_of_wind_wind_blast_triggered);
+    RegisterSpellScript(spell_conclave_of_wind_wind_blast_effect);
     RegisterSpellScript(spell_conclave_of_wind_hurricane);
     RegisterSpellScript(spell_conclave_of_wind_hurricane_ride_vehicle);
     RegisterSpellScript(spell_conclave_of_wind_toxic_spores);