Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4

# Conflicts: # src/server/game/AI/CoreAI/PetAI.cpp # src/server/game/Battlegrounds/Battleground.cpp # src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp # src/server/game/DungeonFinding/LFGMgr.h # src/server/game/DungeonFinding/LFGQueue.h # src/server/game/Entities/Creature/Creature.h # src/server/game/Entities/Pet/Pet.cpp # src/server/game/Entities/Player/Player.cpp # src/server/game/Entities/Player/Player.h # src/server/game/Entities/Unit/Unit.h # src/server/game/Globals/ObjectMgr.h # src/server/game/Groups/Group.cpp # src/server/game/Groups/Group.h # src/server/game/Guilds/Guild.cpp # src/server/game/Guilds/Guild.h # src/server/game/Handlers/GuildHandler.cpp # src/server/game/Handlers/LFGHandler.cpp # src/server/game/Handlers/MiscHandler.cpp # src/server/game/Handlers/NPCHandler.cpp # src/server/game/Instances/InstanceScript.cpp # src/server/game/Maps/Map.cpp # src/server/game/Maps/Map.h # src/server/game/Maps/ZoneScript.cpp # src/server/game/Server/WorldSession.cpp # src/server/game/Spells/SpellEffects.cpp # src/server/game/Weather/Weather.cpp # src/server/game/Weather/WeatherMgr.cpp # src/server/scripts/Commands/cs_reload.cpp # src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp # src/server/scripts/EasternKingdoms/Deadmines/deadmines.h # src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp # src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp # src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h # src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp # src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.h # src/server/scripts/Spells/spell_dk.cpp # src/server/scripts/Spells/spell_druid.cpp # src/server/scripts/Spells/spell_generic.cpp # src/server/scripts/Spells/spell_hunter.cpp # src/server/scripts/Spells/spell_mage.cpp # src/server/scripts/Spells/spell_pet.cpp # src/server/scripts/Spells/spell_shaman.cpp # src/server/scripts/Spells/spell_warrior.cpp
2018-03-28 12:35:52 +02:00
commit 2cfdd3cbe0
@@ -21,15 +21,15 @@
 * Scriptnames of files in this file should be prefixed with "spell_q#questID_".
 */

+#include "ScriptMgr.h"
 #include "CellImpl.h"
+#include "CreatureAIImpl.h"
 #include "CreatureTextMgr.h"
-#include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
 #include "Player.h"
-#include "ScriptMgr.h"
 #include "ScriptedCreature.h"
-#include "SpellScript.h"
 #include "SpellAuraEffects.h"
+#include "SpellScript.h"
 #include "Vehicle.h"

 class spell_generic_quest_update_entry_SpellScript : public SpellScript
@@ -104,9 +104,7 @@ class spell_q2203_thaumaturgy_channel : public SpellScriptLoader

            bool Validate(SpellInfo const* /*spellInfo*/) override
            {
-                if (!sSpellMgr->GetSpellInfo(SPELL_THAUMATURGY_CHANNEL))
-                    return false;
-                return true;
+                return ValidateSpellInfo({ SPELL_THAUMATURGY_CHANNEL });
            }

            void HandleEffectPeriodic(AuraEffect const* /*aurEff*/)
@@ -152,16 +150,14 @@ class spell_q5206_test_fetid_skull : public SpellScriptLoader

            bool Validate(SpellInfo const* /*spellEntry*/) override
            {
-                if (!sSpellMgr->GetSpellInfo(SPELL_CREATE_RESONATING_SKULL) || !sSpellMgr->GetSpellInfo(SPELL_CREATE_BONE_DUST))
-                    return false;
-                return true;
+                return ValidateSpellInfo({ SPELL_CREATE_RESONATING_SKULL, SPELL_CREATE_BONE_DUST });
            }

            void HandleDummy(SpellEffIndex /*effIndex*/)
            {
                Unit* caster = GetCaster();
                uint32 spellId = roll_chance_i(50) ? SPELL_CREATE_RESONATING_SKULL : SPELL_CREATE_BONE_DUST;
-                caster->CastSpell(caster, spellId, true, NULL);
+                caster->CastSpell(caster, spellId, true, nullptr);
            }

            void Register() override
@@ -316,9 +312,7 @@ class spell_q11396_11399_scourging_crystal_controller : public SpellScriptLoader

            bool Validate(SpellInfo const* /*spellEntry*/) override
            {
-                if (!sSpellMgr->GetSpellInfo(SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3) || !sSpellMgr->GetSpellInfo(SPELL_SCOURGING_CRYSTAL_CONTROLLER))
-                    return false;
-                return true;
+                return ValidateSpellInfo({ SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3, SPELL_SCOURGING_CRYSTAL_CONTROLLER });
            }

            void HandleDummy(SpellEffIndex /*effIndex*/)
@@ -354,9 +348,7 @@ class spell_q11396_11399_scourging_crystal_controller_dummy : public SpellScript

            bool Validate(SpellInfo const* /*spellEntry*/) override
            {
-                if (!sSpellMgr->GetSpellInfo(SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3))
-                    return false;
-                return true;
+                return ValidateSpellInfo({ SPELL_FORCE_SHIELD_ARCANE_PURPLE_X3 });
            }

            void HandleDummy(SpellEffIndex /*effIndex*/)
@@ -417,9 +409,7 @@ class spell_q11587_arcane_prisoner_rescue : public SpellScriptLoader

            bool Validate(SpellInfo const* /*spellEntry*/) override
            {
-                if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_ARCANE_PRISONER_MALE) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_ARCANE_PRISONER_FEMALE) || !sSpellMgr->GetSpellInfo(SPELL_ARCANE_PRISONER_KILL_CREDIT))
-                    return false;
-                return true;
+                return ValidateSpellInfo({ SPELL_SUMMON_ARCANE_PRISONER_MALE, SPELL_SUMMON_ARCANE_PRISONER_FEMALE, SPELL_ARCANE_PRISONER_KILL_CREDIT });
            }

            void HandleDummy(SpellEffIndex /*effIndex*/)
@@ -480,9 +470,15 @@ class spell_q11730_ultrasonic_screwdriver : public SpellScriptLoader

            bool Validate(SpellInfo const* /*spellEntry*/) override
            {
-                if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_SCAVENGEBOT_004A8) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_SENTRYBOT_57K) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_DEFENDOTANK_66D) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_SCAVENGEBOT_005B6) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_55D_COLLECTATRON) || !sSpellMgr->GetSpellInfo(SPELL_ROBOT_KILL_CREDIT))
-                    return false;
-                return true;
+                return ValidateSpellInfo(
+                {
+                    SPELL_SUMMON_SCAVENGEBOT_004A8,
+                    SPELL_SUMMON_SENTRYBOT_57K,
+                    SPELL_SUMMON_DEFENDOTANK_66D,
+                    SPELL_SUMMON_SCAVENGEBOT_005B6,
+                    SPELL_SUMMON_55D_COLLECTATRON,
+                    SPELL_ROBOT_KILL_CREDIT
+                });
            }

            void HandleDummy(SpellEffIndex /*effIndex*/)
@@ -592,9 +588,13 @@ class spell_q12634_despawn_fruit_tosser : public SpellScriptLoader

            bool Validate(SpellInfo const* /*spellEntry*/) override
            {
-                if (!sSpellMgr->GetSpellInfo(SPELL_BANANAS_FALL_TO_GROUND) || !sSpellMgr->GetSpellInfo(SPELL_ORANGE_FALLS_TO_GROUND) || !sSpellMgr->GetSpellInfo(SPELL_PAPAYA_FALLS_TO_GROUND) || !sSpellMgr->GetSpellInfo(SPELL_SUMMON_ADVENTUROUS_DWARF))
-                    return false;
-                return true;
+               return ValidateSpellInfo(
+                {
+                    SPELL_BANANAS_FALL_TO_GROUND,
+                    SPELL_ORANGE_FALLS_TO_GROUND,
+                    SPELL_PAPAYA_FALLS_TO_GROUND,
+                    SPELL_SUMMON_ADVENTUROUS_DWARF
+                });
            }

            void HandleDummy(SpellEffIndex /*effIndex*/)
@@ -608,7 +608,7 @@ class spell_q12634_despawn_fruit_tosser : public SpellScriptLoader
                // sometimes, if you're lucky, you get a dwarf
                if (roll_chance_i(5))
                    spellId = SPELL_SUMMON_ADVENTUROUS_DWARF;
-                GetCaster()->CastSpell(GetCaster(), spellId, true, NULL);
+                GetCaster()->CastSpell(GetCaster(), spellId, true, nullptr);
            }

            void Register() override
@@ -642,7 +642,7 @@ class spell_q12683_take_sputum_sample : public SpellScriptLoader
                if (caster->HasAuraEffect(reqAuraId, 0))
                {
                    uint32 spellId = GetSpellInfo()->Effects[EFFECT_0].CalcValue();
-                    caster->CastSpell(caster, spellId, true, NULL);
+                    caster->CastSpell(caster, spellId, true, nullptr);
                }
            }

@@ -744,9 +744,7 @@ class spell_q12937_relief_for_the_fallen : public SpellScriptLoader

            bool Validate(SpellInfo const* /*spellEntry*/) override
            {
-                if (!sSpellMgr->GetSpellInfo(SPELL_TRIGGER_AID_OF_THE_EARTHEN))
-                    return false;
-                return true;
+                return ValidateSpellInfo({ SPELL_TRIGGER_AID_OF_THE_EARTHEN });
            }

            void HandleDummy(SpellEffIndex /*effIndex*/)
@@ -754,7 +752,7 @@ class spell_q12937_relief_for_the_fallen : public SpellScriptLoader
                Player* caster = GetCaster()->ToPlayer();
                if (Creature* target = GetHitCreature())
                {
-                    caster->CastSpell(caster, SPELL_TRIGGER_AID_OF_THE_EARTHEN, true, NULL);
+                    caster->CastSpell(caster, SPELL_TRIGGER_AID_OF_THE_EARTHEN, true, nullptr);
                    caster->KilledMonsterCredit(NPC_FALLEN_EARTHEN_DEFENDER);
                    target->DespawnOrUnsummon();
                }
@@ -790,9 +788,7 @@ class spell_q10041_q10040_who_are_they : public SpellScriptLoader

            bool Validate(SpellInfo const* /*spellEntry*/) override
            {
-                if (!sSpellMgr->GetSpellInfo(SPELL_MALE_DISGUISE) || !sSpellMgr->GetSpellInfo(SPELL_FEMALE_DISGUISE) || !sSpellMgr->GetSpellInfo(SPELL_GENERIC_DISGUISE))
-                    return false;
-                return true;
+                return ValidateSpellInfo({ SPELL_MALE_DISGUISE, SPELL_FEMALE_DISGUISE, SPELL_GENERIC_DISGUISE });
            }

            void HandleScript(SpellEffIndex effIndex)
@@ -1072,9 +1068,7 @@ class spell_q14112_14145_chum_the_water: public SpellScriptLoader

            bool Validate(SpellInfo const* /*spellEntry*/) override
            {
-                if (!sSpellMgr->GetSpellInfo(SUMMON_ANGRY_KVALDIR) || !sSpellMgr->GetSpellInfo(SUMMON_NORTH_SEA_MAKO) || !sSpellMgr->GetSpellInfo(SUMMON_NORTH_SEA_THRESHER) || !sSpellMgr->GetSpellInfo(SUMMON_NORTH_SEA_BLUE_SHARK))
-                    return false;
-                return true;
+                return ValidateSpellInfo({ SUMMON_ANGRY_KVALDIR, SUMMON_NORTH_SEA_MAKO, SUMMON_NORTH_SEA_THRESHER, SUMMON_NORTH_SEA_BLUE_SHARK });
            }

            void HandleScriptEffect(SpellEffIndex /*effIndex*/)
@@ -1684,16 +1678,14 @@ class spell_q12527_zuldrak_rat : public SpellScriptLoader

            bool Validate(SpellInfo const* /*spell*/) override
            {
-                if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_GORGED_LURKING_BASILISK))
-                    return false;
-                return true;
+                return ValidateSpellInfo({ SPELL_SUMMON_GORGED_LURKING_BASILISK });
            }

            void HandleScriptEffect(SpellEffIndex /* effIndex */)
            {
                if (GetHitAura() && GetHitAura()->GetStackAmount() >= GetSpellInfo()->StackAmount)
                {
-                    GetHitUnit()->CastSpell((Unit*) NULL, SPELL_SUMMON_GORGED_LURKING_BASILISK, true);
+                    GetHitUnit()->CastSpell((Unit*) nullptr, SPELL_SUMMON_GORGED_LURKING_BASILISK, true);
                    if (Creature* basilisk = GetHitUnit()->ToCreature())
                        basilisk->DespawnOrUnsummon();
                }
@@ -1756,9 +1748,7 @@ class spell_q12730_quenching_mist : public SpellScriptLoader

            bool Validate(SpellInfo const* /*spellInfo*/) override
            {
-                if (!sSpellMgr->GetSpellInfo(SPELL_FLICKERING_FLAMES))
-                    return false;
-                return true;
+                return ValidateSpellInfo({ SPELL_FLICKERING_FLAMES });
            }

            void HandleEffectPeriodic(AuraEffect const* /*aurEff*/)
@@ -1799,10 +1789,7 @@ class spell_q13291_q13292_q13239_q13261_frostbrood_skytalon_grab_decoy : public

            bool Validate(SpellInfo const* /*spell*/) override
            {
-                if (!sSpellMgr->GetSpellInfo(SPELL_RIDE))
-                    return false;
-
-                return true;
+                return ValidateSpellInfo({ SPELL_RIDE });
            }

            void HandleDummy(SpellEffIndex /*effIndex*/)
@@ -1902,10 +1889,11 @@ class spell_q13011_bear_flank_master : public SpellScriptLoader

            bool Validate(SpellInfo const* /*spellInfo*/) override
            {
-                if (!sSpellMgr->GetSpellInfo(SPELL_BEAR_FLANK_MASTER) ||
-                    !sSpellMgr->GetSpellInfo(SPELL_CREATE_BEAR_FLANK))
-                    return false;
-                return true;
+                return ValidateSpellInfo(
+                {
+                    SPELL_CREATE_BEAR_FLANK,
+                    SPELL_BEAR_FLANK_FAIL
+                });
            }

            bool Load() override
@@ -1951,9 +1939,7 @@ class spell_q13086_cannons_target : public SpellScriptLoader

            bool Validate(SpellInfo const* spellInfo) override
            {
-                if (!sSpellMgr->GetSpellInfo(spellInfo->Effects[EFFECT_0].CalcValue()))
-                    return false;
-                return true;
+                return ValidateSpellInfo({ static_cast<uint32>(spellInfo->Effects[EFFECT_0].CalcValue()) });
            }

            void HandleEffectDummy(SpellEffIndex /*effIndex*/)
@@ -2088,14 +2074,15 @@ class spell_q12690_burst_at_the_seams : public SpellScriptLoader

            bool Validate(SpellInfo const* /*spellInfo*/) override
            {
-                if (!sSpellMgr->GetSpellInfo(SPELL_BURST_AT_THE_SEAMS)
-                    || !sSpellMgr->GetSpellInfo(SPELL_BURST_AT_THE_SEAMS_DMG)
-                    || !sSpellMgr->GetSpellInfo(SPELL_BURST_AT_THE_SEAMS_DMG_2)
-                    || !sSpellMgr->GetSpellInfo(SPELL_BURST_AT_THE_SEAMS_BONE)
-                    || !sSpellMgr->GetSpellInfo(SPELL_BURST_AT_THE_SEAMS_MEAT)
-                    || !sSpellMgr->GetSpellInfo(SPELL_BURST_AT_THE_SEAMS_BMEAT))
-                    return false;
-                return true;
+                return ValidateSpellInfo(
+                {
+                    SPELL_BURST_AT_THE_SEAMS,
+                    SPELL_BURST_AT_THE_SEAMS_DMG,
+                    SPELL_BURST_AT_THE_SEAMS_DMG_2,
+                    SPELL_BURST_AT_THE_SEAMS_BONE,
+                    SPELL_BURST_AT_THE_SEAMS_MEAT,
+                    SPELL_BURST_AT_THE_SEAMS_BMEAT
+                });
            }

            bool Load() override
@@ -2164,9 +2151,7 @@ class spell_q12308_escape_from_silverbrook : public SpellScriptLoader

            bool Validate(SpellInfo const* /*spellInfo*/) override
            {
-                if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_WORGEN))
-                    return false;
-                return true;
+                return ValidateSpellInfo({ SPELL_SUMMON_WORGEN });
            }

            void HandleDummy(SpellEffIndex /*effIndex*/)
@@ -2242,12 +2227,13 @@ class spell_q12641_death_comes_from_on_high : public SpellScriptLoader

            bool Validate(SpellInfo const* /*spellInfo*/) override
            {
-                if (!sSpellMgr->GetSpellInfo(SPELL_FORGE_CREDIT) ||
-                    !sSpellMgr->GetSpellInfo(SPELL_TOWN_HALL_CREDIT) ||
-                    !sSpellMgr->GetSpellInfo(SPELL_SCARLET_HOLD_CREDIT) ||
-                    !sSpellMgr->GetSpellInfo(SPELL_CHAPEL_CREDIT))
-                    return false;
-                return true;
+                return ValidateSpellInfo(
+                {
+                    SPELL_FORGE_CREDIT,
+                    SPELL_TOWN_HALL_CREDIT,
+                    SPELL_SCARLET_HOLD_CREDIT,
+                    SPELL_CHAPEL_CREDIT
+                });
            }

            void HandleDummy(SpellEffIndex /*effIndex*/)
@@ -2272,7 +2258,7 @@ class spell_q12641_death_comes_from_on_high : public SpellScriptLoader
                        return;
                }

-                GetCaster()->CastSpell((Unit*)NULL, spellId, true);
+                GetCaster()->CastSpell((Unit*)nullptr, spellId, true);
            }

            void Register() override
@@ -2338,7 +2324,7 @@ class spell_q12619_emblazon_runeblade : public SpellScriptLoader
            {
                PreventDefaultAction();
                if (Unit* caster = GetCaster())
-                    caster->CastSpell(caster, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, true, NULL, aurEff);
+                    caster->CastSpell(caster, GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell, true, nullptr, aurEff);
            }

            void Register() override
@@ -2397,9 +2383,7 @@ class spell_q12919_gymers_grab : public SpellScriptLoader

            bool Validate(SpellInfo const* /*spell*/) override
            {
-                if (!sSpellMgr->GetSpellInfo(SPELL_RIDE_GYMER))
-                    return false;
-                return true;
+                return ValidateSpellInfo({ SPELL_RIDE_GYMER });
            }

            void HandleScript(SpellEffIndex /*effIndex*/)
@@ -2476,9 +2460,7 @@ class spell_q13400_illidan_kill_master : public SpellScriptLoader

            bool Validate(SpellInfo const* /*spellInfo*/) override
            {
-                if (!sSpellMgr->GetSpellInfo(SPELL_ILLIDAN_KILL_CREDIT))
-                    return false;
-                return true;
+                return ValidateSpellInfo({ SPELL_ILLIDAN_KILL_CREDIT });
            }

            void HandleDummy(SpellEffIndex /*effIndex*/)
@@ -2518,9 +2500,7 @@ class spell_q14100_q14111_make_player_destroy_totems : public SpellScriptLoader

            bool Validate(SpellInfo const* /*spellInfo*/) override
            {
-                if (!sSpellMgr->GetSpellInfo(SPELL_TOTEM_OF_THE_EARTHEN_RING))
-                    return false;
-                return true;
+                return ValidateSpellInfo({ SPELL_TOTEM_OF_THE_EARTHEN_RING });
            }

            void HandleScriptEffect(SpellEffIndex /*effIndex*/)
@@ -2559,11 +2539,7 @@ class spell_q10929_fumping : SpellScriptLoader

            bool Validate(SpellInfo const* /*spell*/) override
            {
-                if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_SAND_GNOME))
-                    return false;
-                if (!sSpellMgr->GetSpellInfo(SPELL_SUMMON_BONE_SLICER))
-                    return false;
-                return true;
+                return ValidateSpellInfo({ SPELL_SUMMON_SAND_GNOME, SPELL_SUMMON_BONE_SLICER });
            }

            void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
@@ -2605,9 +2581,7 @@ public:

        bool Validate(SpellInfo const* /*spellInfo*/) override
        {
-            if (!sSpellMgr->GetSpellInfo(SPELL_RENEWED_LIFE))
-                return false;
-            return true;
+            return ValidateSpellInfo({ SPELL_RENEWED_LIFE });
        }

        void HandleDummyEffect()