Core: whitespace cleanup, reduce double blank line to single (#25795)

* Core/Misc: fix double empty line * worldserver.conf (cherry picked from commit a32b6b8ac4)
2026-06-20 23:11:56 -04:00 · 2021-01-03 17:47:07 +07:00
parent 05a9b2d2cb
commit 373ed8f46b
107 changed files with 0 additions and 144 deletions
@@ -215,7 +215,6 @@ void BattlefieldTB::OnPlayerJoinWar(Player* player)
        player->CastSpell(player, SPELL_TOWER_ATTACK_BONUS, CastSpellExtraArgs(TRIGGERED_FULL_MASK).AddSpellMod(SPELLVALUE_AURA_STACK, GetData(BATTLEFIELD_TB_DATA_TOWERS_DESTROYED)));
 }

-
 void BattlefieldTB::OnPlayerLeaveWar(Player* player)
 {
    RemoveAurasFromPlayer(player);
@@ -481,7 +481,6 @@ bool BattlefieldWG::SetupBattlefield()
        m_GraveyardList[i] = graveyard;
    }

-
    Workshops.resize(WG_MAX_WORKSHOP);
    // Spawn workshop creatures and gameobjects
    for (uint8 i = 0; i < WG_MAX_WORKSHOP; i++)
@@ -577,7 +576,6 @@ void BattlefieldWG::OnBattleStart()
    else
        TC_LOG_ERROR("bg.battlefield", "WG: Failed to spawn titan relic.");

-
    // Update tower visibility and update faction
    for (auto itr = CanonList.begin(); itr != CanonList.end(); ++itr)
    {
@@ -1151,7 +1149,6 @@ uint32 BattlefieldWG::GetData(uint32 data) const
    return Battlefield::GetData(data);
 }

-
 void BattlefieldWG::FillInitialWorldStates(WorldPackets::WorldState::InitWorldStates& packet)
 {
    packet.Worldstates.emplace_back(WS_BATTLEFIELD_WG_DEFENDED_A, GetData(BATTLEFIELD_WG_DATA_DEF_A));
@@ -388,7 +388,6 @@ public:
            fields[0].GetCString(), fields[1].GetCString(), permanent ? handler->GetTrinityString(LANG_BANINFO_NEVER) : fields[2].GetCString(),
            permanent ? handler->GetTrinityString(LANG_BANINFO_INFINITE) : secsToTimeString(fields[3].GetUInt64(), TimeFormat::ShortText).c_str(), fields[4].GetCString(), fields[5].GetCString());

-
        return true;
    }

@@ -164,7 +164,6 @@ public:
        Player* player = handler->GetSession()->GetPlayer();
        Seconds spawntm(spawntime.value_or(300));

-
        if (!sObjectMgr->GetGameObjectTemplate(objectId))
        {
            handler->PSendSysMessage(LANG_GAMEOBJECT_NOT_EXIST, objectId);
@@ -99,8 +99,6 @@ public:
        // "kill" original creature
        creatureTarget->DespawnOrUnsummon();

-
-
        // prepare visual effect for levelup
        pet->SetLevel(player->GetLevel() - 1);

@@ -164,8 +164,6 @@ bool ticket_commandscript::HandleTicketAssignToCommand(ChatHandler* handler, cha
    return true;
 }

-
-
 template<typename T>
 bool ticket_commandscript::HandleTicketCloseByIdCommand(ChatHandler* handler, char const* args)
 {
@@ -285,7 +283,6 @@ bool ticket_commandscript::HandleTicketDeleteByIdCommand(ChatHandler* handler, c
    return true;
 }

-
 template<typename T>
 bool ticket_commandscript::HandleTicketResetCommand(ChatHandler* handler, char const* /*args*/)
 {
@@ -17,7 +17,6 @@

 // This is where scripts' loading functions should be declared:

-
 // The name of this function should match:
 // void Add${NameOfDirectory}Scripts()
 void AddCustomScripts()
@@ -47,7 +47,6 @@ enum Netherspite
    SPELL_NETHERSPITE_ROAR      = 38684,
 };

-
 const float PortalCoord[3][3] =
 {
    {-11195.353516f, -1613.237183f, 278.237258f}, // Left side
@@ -124,7 +124,6 @@ public:
        void JustEngagedWith(Unit* /*who*/) override { }
        void MoveInLineOfSight(Unit* /*who*/) override { }

-
        void UpdateAI(uint32 diff) override
        {
            if (HellfireTimer)
@@ -1007,7 +1007,6 @@ enum JulianneRomulo
    ROMULO_Y                        = -1758,
 };

-
 enum RAJPhase
 {
    PHASE_JULIANNE      = 0,
@@ -418,7 +418,6 @@ public:
 #define SAY_DIALOG_ARCANAGOS_8      "What have you done, wizard? This cannot be! I'm burning from... within!"
 #define SAY_DIALOG_MEDIVH_9         "He should not have angered me. I must go... recover my strength now..."

-
 static float MedivPos[4] = {-11161.49f, -1902.24f, 91.48f, 1.94f};
 static float ArcanagosPos[4] = {-11169.75f, -1881.48f, 95.39f, 4.83f};

@@ -245,8 +245,6 @@ Position const SummonPos[18] =
 {
    // Hall of Secrects

-
-
    // The Hall of the damned
    { 177.9624f, -68.23893f, 84.95197f, 3.228859f },
    { 183.7705f, -61.43489f, 84.92424f, 5.148721f },
@@ -265,8 +263,6 @@ Position const SummonPos[18] =
    { 185.6157f, -42.91200f, 75.4812f, 4.45059f },
    // Vault of the Ravenian

-
-
 };

 enum Creatures
@@ -462,7 +462,6 @@ class spell_apothecary_validate_area : public SpellScriptLoader
                targets.push_back(target);
            }

-
            void HandleScript(SpellEffIndex /*effindex*/)
            {
                GetHitUnit()->CastSpell(GetHitUnit(), SPELL_BUNNY_LOCKDOWN, true);
@@ -221,7 +221,6 @@ class npc_voljin_zulaman : public CreatureScript
        }
 };

-
 void AddSC_zulaman()
 {
    new npc_voljin_zulaman();
@@ -202,7 +202,6 @@ class npc_hearthsinger_forresten_cot : public CreatureScript
                }
            }

-
        private:
            InstanceScript const* const _instance;
            EventMap _events;
@@ -1459,7 +1458,6 @@ public:
    }
 };

-
 void AddSC_culling_of_stratholme()
 {
    new npc_hearthsinger_forresten_cot();
@@ -85,7 +85,6 @@ enum Actions
    ACTION_EQUIP_DECIMATION_BLADE   = 3,
 };

-
 enum Misc
 {
    EQUIP_DEFAULT                   = 1,
@@ -82,7 +82,6 @@ enum Spells

    SPELL_CRUMBLING_RUIN                = 75609,

-
    SPELL_NEMESIS_STRIKE                = 75604,

    SPELL_OMEGA_STANCE_SUMMON           = 77106,
@@ -190,7 +190,6 @@ public:
            summons.Summon(summoned);
        }

-
        void KilledUnit(Unit* /*victim*/) override
        {
            Talk(SAY_KILL);
@@ -225,7 +225,6 @@ public:
                DoFindNewTubber();
        }

-
        bool IsMovementActive;
        ObjectGuid TargetTubberGUID;
    };
@@ -82,7 +82,6 @@ public:
            _Reset();
        }

-
        void JustDied(Unit* /*killer*/) override
        {
            if (instance->GetData(DATA_BUG_TRIO_DEATH) < 2)// Unlootable if death
@@ -37,7 +37,6 @@ ObjectData const creatureData[] =
    { 0,             0              } // END
 };

-
 DoorData const doorData[] =
 {
    { AQ40_DOOR_1, DATA_SARTURA,       DOOR_TYPE_PASSAGE },
@@ -49,8 +49,6 @@ enum RuulSnowhoof
    SAY_FINISH                  = 0
 };

-
-
 Position const RuulSnowhoofSummonsCoord[6] =
 {
    { 3449.218018f, -587.825073f, 174.978867f, 4.714445f },
@@ -126,7 +126,6 @@ struct boss_volazj : public BossAI
        if (me->HasUnitFlag(UNIT_FLAG_NOT_SELECTABLE))
            damage = 0;

-
        if ((GetHealthPct(0) >= 66 && GetHealthPct(damage) < 66)||
            (GetHealthPct(0) >= 33 && GetHealthPct(damage) < 33))
        {
@@ -1908,8 +1908,6 @@ class spell_halion_blazing_aura : public SpellScriptLoader
        }
 };

-
-
 void AddSC_boss_halion()
 {
    new boss_halion();
@@ -107,7 +107,6 @@ enum Misc
    POINT_SUMMONED          = 1
 };

-
 struct boss_jaraxxus : public BossAI
 {
    boss_jaraxxus(Creature* creature) : BossAI(creature, DATA_JARAXXUS) { }
@@ -274,7 +274,6 @@ class npc_pit_of_saron_icicle : public CreatureScript
        }
 };

-
 class spell_pos_ice_shards : public SpellScriptLoader
 {
    public:
@@ -124,7 +124,6 @@ enum Actions
    ACTION_ACQUIRE_TARGET
 };

-
 /* Room side checking logic */
 static AreaBoundary* const livingSide = new RectangleBoundary(2633.84f, 2750.49f, -3434.0f, -3360.78f);
 static AreaBoundary* const deadSide = new RectangleBoundary(2633.84f, 2750.49f, -3360.78f, -3285.0f);
@@ -161,7 +160,6 @@ static Player* FindEligibleTarget(Creature const* me, bool isGateOpen)
    return nullptr;
 }

-
 /* Wave data */
 typedef std::pair<uint32, uint8> GothikWaveEntry; // (npcEntry, npcCount)
 typedef std::set<GothikWaveEntry> GothikWave;
@@ -286,7 +284,6 @@ const GothikWaveData waves25 =
    0}
 };

-
 // GUID of first trigger NPC (used as offset for guid checks)
 // 0-1 are living side soul triggers, 2-3 are spectral side soul triggers, 4 is living rider spawn trigger, 5-7 are living other spawn trigger, 8-12 are skull pile triggers
 const uint32 CGUID_TRIGGER = 127618;
@@ -122,7 +122,6 @@ enum PetMisc
    OVERLOAD_DISTANCE       = 28
 };

-
 //Thaddius
 enum ThaddiusYells
 {
@@ -1242,7 +1241,6 @@ class achievement_thaddius_shocking : public AchievementCriteriaScript
        }
 };

-
 void AddSC_boss_thaddius()
 {
    RegisterNaxxramasCreatureAI(boss_thaddius);
@@ -212,7 +212,6 @@ enum NAXInstanceTexts
    SAY_DIALOGUE_SAPPHIRON_LICH_KING2 = 2
 };

-
 template <class AI, class T>
 inline AI* GetNaxxramasAI(T* obj)
 {
@@ -502,7 +502,6 @@ struct npc_pummeller : public ScriptedAI
            return;
        }

-
        if (Creature* xt002 = _instance->GetCreature(BOSS_XT002))
            xt002->AI()->JustSummoned(me);

@@ -72,7 +72,6 @@ class instance_utgarde_pinnacle : public InstanceMapScript
                LoadObjectData(creatureData, gameObjectData);
            }

-
            void OnGameObjectCreate(GameObject* go) override
            {
                InstanceScript::OnGameObjectCreate(go);
@@ -136,7 +136,6 @@ public:
        void JustEngagedWith(Unit* /*who*/) override { }
        void MoveInLineOfSight(Unit* /*who*/) override { }

-
        void JustDied(Unit* killer) override
        {
            if (!killer || killer->GetTypeId() != TYPEID_PLAYER)
@@ -265,7 +264,6 @@ public:
        void JustEngagedWith(Unit* /*who*/) override { }
        void MoveInLineOfSight(Unit* /*who*/) override { }

-
        void JustDied(Unit* /*killer*/) override
        {
            if (GameObject* go_caribou = ObjectAccessor::GetGameObject(*me, go_caribouGUID))
@@ -240,7 +240,6 @@ public:

        void MoveInLineOfSight(Unit* /*who*/) override { }

-
        void UpdateAI(uint32 /*diff*/) override
        {
            if (!UpdateVictim())
@@ -445,7 +445,6 @@ public:

        void MoveInLineOfSight(Unit* /*who*/) override { }

-
        void JustSummoned(Creature* Summoned) override
        {
            Summons.Summon(Summoned);
@@ -164,7 +164,6 @@ public:
    }
 };

-
 /*####
 ## npc_released_offspring_harkoa
 ####*/
@@ -36,7 +36,6 @@ uint32 const ZM_GRAVEYARD_ZONE = 3521;
 // linked when the central tower is controlled
 uint32 const ZM_GRAVEYARD_ID = 969;

-
 // banners 182527, 182528, 182529, gotta check them ingame
 go_type const ZM_Banner_A = { 182527, 530, { 253.54f, 7083.81f, 36.7728f, -0.017453f }, { 0.0f, 0.0f, 0.008727f, -0.999962f } };
 go_type const ZM_Banner_H = { 182528, 530, { 253.54f, 7083.81f, 36.7728f, -0.017453f }, { 0.0f, 0.0f, 0.008727f, -0.999962f } };
@@ -89,7 +89,6 @@ enum Events
    EVENT_CHARGE_PLAYER
 };

-
 struct boss_gurtogg_bloodboil : public BossAI
 {
    boss_gurtogg_bloodboil(Creature* creature) : BossAI(creature, DATA_GURTOGG_BLOODBOIL)
@@ -2127,7 +2127,6 @@ class spell_illidan_demon_transform1 : public AuraScript
    }
 };

-
 // 40398 - Demon Transform 2
 class spell_illidan_demon_transform2 : public AuraScript
 {
@@ -238,7 +238,6 @@ private:
    bool _inCombat;
 };

-
 struct IllidariCouncilBossAI : public BossAI
 {
    IllidariCouncilBossAI(Creature* creature, uint32 bossId) : BossAI(creature, bossId), _bossId(bossId)
@@ -15,7 +15,6 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-
 #include "ScriptMgr.h"
 #include "black_temple.h"
 #include "ScriptedCreature.h"
@@ -198,7 +198,6 @@ static float const MIDDLE_OF_ROOM    = 400.0f;
 static float const FACE_THE_DOOR     = 0.08726646f;
 static float const FACE_THE_PLATFORM = 3.118662f;

-
 struct boss_shade_of_akama : public BossAI
 {
    boss_shade_of_akama(Creature* creature) : BossAI(creature, DATA_SHADE_OF_AKAMA)
@@ -795,7 +794,6 @@ struct npc_ashtongue_defender : public ScriptedAI
        _events.ScheduleEvent(EVENT_WINDFURY, 8s, 12s);
    }

-
    void UpdateAI(uint32 diff) override
    {
        if (!UpdateVictim())
@@ -68,7 +68,6 @@ enum HydrossTheUnstable
    ENTRY_BEAM_DUMMY            = 21934
 };

-
 #define HYDROSS_X                   -239.439f
 #define HYDROSS_Y                   -363.481f

@@ -603,7 +603,6 @@ public:

        void MoveInLineOfSight(Unit* /*who*/) override { }

-
        void UpdateAI(uint32 diff) override
        {
            if (!VashjGUID)
@@ -853,7 +852,6 @@ public:

        void MoveInLineOfSight(Unit* /*who*/) override { }

-
        void UpdateAI(uint32 diff) override
        {
            if (CheckTimer <= diff)
@@ -45,7 +45,6 @@ enum Spells
    SPELL_SUBMERGE          = 37550,
    SPELL_EMERGE            = 20568,

-
    // Ambusher spells
    SPELL_SPREAD_SHOT       = 37790,
    SPELL_SHOOT             = 37770,
@@ -49,7 +49,6 @@ enum Misc
    MIN_KILLS                       = 30
 };

-
 //NOTE: there are 6 platforms
 //there should be 3 shatterers and 2 priestess on all platforms, total of 30 elites, else it won't work!
 //delete all other elites not on platforms! these mobs should only be on those platforms nowhere else.
@@ -148,7 +148,6 @@ public:

        void MoveInLineOfSight(Unit* /*who*/) override { }

-
        void AttackStart(Unit* /*who*/) override { }

        void JustEngagedWith(Unit* /*who*/) override { }
@@ -279,7 +279,6 @@ class instance_shattered_halls : public InstanceMapScript
        };
 };

-
 void AddSC_instance_shattered_halls()
 {
    new instance_shattered_halls();
@@ -648,7 +648,6 @@ class npc_simon_bunny : public CreatureScript
                    playableSequence.push_back(*i);
            }

-
            // Remove any existant glowing auras over clusters and set clusters ready for interating with them.
            void PrepareClusters(bool clustersOnly = false)
            {
@@ -50,7 +50,6 @@ class npc_pet_shaman_earth_elemental : public CreatureScript
        {
            npc_pet_shaman_earth_elementalAI(Creature* creature) : ScriptedAI(creature) { }

-
            void Reset() override
            {
                _events.Reset();
@@ -196,7 +196,6 @@ class spell_dh_chaos_strike : public AuraScript
    }
 };

-
 // 206416 - First Blood
 class spell_dh_first_blood : public AuraScript
 {
@@ -458,14 +457,12 @@ void AddSC_demon_hunter_spell_scripts()

    /* Spells & Auras */

-
    /* Auras */

    RegisterSpellScript(spell_dh_first_blood);

    /* AreaTrigger */

-
    /* Spells */

    RegisterSpellScript(spell_dh_blade_dance);
@@ -430,7 +430,6 @@ class spell_dk_death_grip_initial : public SpellScript
    }
 };

-
 // 48743 - Death Pact
 class spell_dk_death_pact : public AuraScript
 {
@@ -2809,7 +2809,6 @@ enum ReindeerTransformation
    SPELL_REINDEER_60                           = 25858,
 };

-
 class spell_item_reindeer_transformation : public SpellScript
 {
    PrepareSpellScript(spell_item_reindeer_transformation);
@@ -2138,7 +2138,6 @@ class spell_q13264_q13276_q13288_q13289_bloated_abom_feign_death : public AuraSc
    }
 };

-
 class spell_q13264_q13276_q13288_q13289_area_restrict_abom : public SpellScript
 {
    PrepareSpellScript(spell_q13264_q13276_q13288_q13289_area_restrict_abom);
@@ -311,7 +311,6 @@ public:
    }
 };

-
 void AddSC_action_ip_logger()
 {
    new AccountActionIpLogger();