Server/Misc: Drop some redundant blanklines.

Signed-off-by: AriDEV <aridev666@gmail.com>
ProjectSkyfire · Sep 26, 2020 · 39ca657 · 39ca657
1 parent 4f4eb13
commit 39ca657
Show file tree

Hide file tree

Showing 27 changed files with 13 additions and 70 deletions.
diff --git a/src/server/collision/RegularGrid.h b/src/server/collision/RegularGrid.h
@@ -42,7 +42,6 @@ class PositionFunc = PositionTrait<T>
 class RegularGrid2D
 {
 public:
-
     enum{
         CELL_NUMBER = 64,
     };

diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundDS.cpp
@@ -40,10 +40,7 @@ BattlegroundDS::BattlegroundDS()
     StartMessageIds[BG_STARTING_EVENT_FOURTH] = LANG_ARENA_HAS_BEGUN;
 }
 
-BattlegroundDS::~BattlegroundDS()
-{
-
-}
+BattlegroundDS::~BattlegroundDS() { }
 
 void BattlegroundDS::PostUpdateImpl(uint32 diff)
 {

diff --git a/src/server/game/Movement/MotionMaster.h b/src/server/game/Movement/MotionMaster.h
@@ -96,8 +96,8 @@ class MotionMaster //: private std::stack<MovementGenerator *>
 
         bool needInitTop() const { return _needInit[_top]; }
         void InitTop();
-    public:
 
+    public:
         explicit MotionMaster(Unit* unit) : _expList(NULL), _top(-1), _owner(unit), _cleanFlag(MMCF_NONE) { }
         ~MotionMaster();
 
@@ -177,6 +177,7 @@ class MotionMaster //: private std::stack<MovementGenerator *>
         void propagateSpeedChange();
 
         bool GetDestination(float &x, float &y, float &z);
+
     private:
         void Mutate(MovementGenerator *m, MovementSlot slot);                  // use Move* functions instead
 

diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.h b/src/server/game/OutdoorPvP/OutdoorPvP.h
@@ -92,7 +92,6 @@ typedef std::set<uint64> PlayerSet;
 class OPvPCapturePoint
 {
     public:
-
         OPvPCapturePoint(OutdoorPvP* pvp);
 
         virtual ~OPvPCapturePoint() { }
@@ -144,7 +143,6 @@ class OPvPCapturePoint
             float rotation0 = 0, float rotation1 = 0, float rotation2 = 0, float rotation3 = 0);
 
     protected:
-
         bool AddObject(uint32 type, uint32 entry, uint32 map, float x, float y, float z, float o,
             float rotation0, float rotation1, float rotation2, float rotation3);
         bool AddCreature(uint32 type, uint32 entry, uint32 teamval, uint32 map, float x, float y, float z, float o, uint32 spawntimedelay = 0);
@@ -155,7 +153,6 @@ class OPvPCapturePoint
         bool DelCapturePoint();
 
     protected:
-
         // active players in the area of the objective, 0 - alliance, 1 - horde
         PlayerSet m_activePlayers[2];
 
@@ -195,7 +192,6 @@ class OutdoorPvP : public ZoneScript
     friend class OutdoorPvPMgr;
 
     public:
-
         // ctor
         OutdoorPvP();
 
@@ -252,7 +248,6 @@ class OutdoorPvP : public ZoneScript
         void TeamApplyBuff(TeamId team, uint32 spellId, uint32 spellId2 = 0);
 
     protected:
-
         // the map of the objectives belonging to this outdoorpvp
         OPvPCapturePointMap m_capturePoints;
 

diff --git a/src/server/game/Warden/WardenMac.cpp b/src/server/game/Warden/WardenMac.cpp
@@ -128,7 +128,6 @@ struct keyData {
 
 void WardenMac::HandleHashResult(ByteBuffer &buff)
 {
-
     // test
     int keyIn[4];
 

diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp
@@ -57,7 +57,6 @@ enum Spells
     SPELL_SUMMON_PURE_ENERGY        = 44322, // mod scale -10
     H_SPELL_SUMMON_PURE_ENERGY1     = 46154, // mod scale -5
     H_SPELL_SUMMON_PURE_ENERGY2     = 46159  // mod scale -5
-
 };
 
 enum Creatures

diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_cannon_master_willey.cpp
@@ -222,7 +222,6 @@ class boss_cannon_master_willey : public CreatureScript
             DoMeleeAttackIfReady();
         }
     };
-
 };
 
 void AddSC_boss_cannon_master_willey()

diff --git a/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp b/src/server/scripts/EasternKingdoms/Stratholme/boss_dathrohan_balnazzar.cpp
@@ -218,7 +218,6 @@ class boss_dathrohan_balnazzar : public CreatureScript
             DoMeleeAttackIfReady();
         }
     };
-
 };
 
 void AddSC_boss_dathrohan_balnazzar()

diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
@@ -211,7 +211,6 @@ class instance_razorfen_downs : public InstanceMapScript
             return 0;
         }
     };
-
 };
 
 void AddSC_instance_razorfen_downs()

diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_fankriss.cpp
@@ -205,7 +205,6 @@ class boss_fankriss : public CreatureScript
             DoMeleeAttackIfReady();
         }
     };
-
 };
 
 void AddSC_boss_fankriss()

diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
@@ -81,7 +81,6 @@ class npc_webbed_creature : public CreatureScript
                 me->SummonCreature(spawnCreatureID, 0.0f, 0.0f, 0.0f, me->GetOrientation(), TempSummonType::TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 60000);
         }
     };
-
 };
 
 /*######
@@ -147,7 +146,6 @@ class npc_captured_sunhawk_agent : public CreatureScript
 
         return true;
     }
-
 };
 
 /*######

diff --git a/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp b/src/server/scripts/Northrend/Gundrak/boss_moorabi.cpp
@@ -172,7 +172,6 @@ class boss_moorabi : public CreatureScript
             Talk(SAY_SLAY);
         }
     };
-
 };
 
 class achievement_less_rabi : public AchievementCriteriaScript

diff --git a/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp b/src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
@@ -149,7 +149,6 @@ class boss_maexxna : public CreatureScript
             DoMeleeAttackIfReady();
         }
     };
-
 };
 
 class npc_webwrap : public CreatureScript
@@ -183,7 +182,6 @@ class npc_webwrap : public CreatureScript
                     victim->RemoveAurasDueToSpell(me->m_spells[0], me->GetGUID());
         }
     };
-
 };
 
 void AddSC_boss_maexxna()

diff --git a/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_noth.cpp
@@ -215,7 +215,6 @@ class boss_noth : public CreatureScript
                 DoMeleeAttackIfReady();
         }
     };
-
 };
 
 void AddSC_boss_noth()

diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
@@ -189,7 +189,6 @@ class npc_unstable_sphere : public CreatureScript
         uint32 pulseTimer;
         uint32 deathTimer;
     };
-
 };
 
 void AddSC_boss_drakos()

diff --git a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/boss_loken.cpp
@@ -190,7 +190,6 @@ class boss_loken : public CreatureScript
             DoMeleeAttackIfReady();
         }
     };
-
 };
 
 class spell_loken_pulsing_shockwave : public SpellScriptLoader

diff --git a/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp b/src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp
@@ -159,7 +159,6 @@ class boss_shirrak_the_dead_watcher : public CreatureScript
             DoMeleeAttackIfReady();
         }
     };
-
 };
 
 class npc_focus_fire : public CreatureScript
@@ -174,9 +173,7 @@ class npc_focus_fire : public CreatureScript
 
     struct npc_focus_fireAI : public ScriptedAI
     {
-        npc_focus_fireAI(Creature* creature) : ScriptedAI(creature)
-        {
-        }
+        npc_focus_fireAI(Creature* creature) : ScriptedAI(creature) { }
 
         uint32 FieryBlast_Timer;
         bool fiery1, fiery2;
@@ -210,7 +207,6 @@ class npc_focus_fire : public CreatureScript
             DoMeleeAttackIfReady();
         }
     };
-
 };
 
 void AddSC_boss_shirrak_the_dead_watcher()

diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.cpp b/src/server/scripts/Outland/BlackTemple/black_temple.cpp
@@ -118,7 +118,6 @@ class npc_wrathbone_flayer : public CreatureScript
 
         void UpdateAI(uint32 diff) OVERRIDE
         {
-
             if (!enteredCombat)
             {
                 events.Update(diff);

diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/boss_warlord_kalithresh.cpp
@@ -101,7 +101,6 @@ class npc_naga_distiller : public CreatureScript
                     instance->SetData(DATA_DISTILLER, DONE);
         }
     };
-
 };
 
 class boss_warlord_kalithresh : public CreatureScript

diff --git a/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/TheUnderbog/boss_the_black_stalker.cpp
@@ -188,7 +188,6 @@ class boss_the_black_stalker : public CreatureScript
             DoMeleeAttackIfReady();
         }
     };
-
 };
 
 void AddSC_boss_the_black_stalker()

diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_commander_sarannis.cpp
@@ -49,7 +49,8 @@ enum Events
 
 class boss_commander_sarannis : public CreatureScript
 {
-    public: boss_commander_sarannis() : CreatureScript("boss_commander_sarannis") { }
+    public:
+        boss_commander_sarannis() : CreatureScript("boss_commander_sarannis") { }
 
         struct boss_commander_sarannisAI : public BossAI
         {

diff --git a/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp
@@ -58,11 +58,7 @@ enum Creatures
 class boss_high_botanist_freywinn : public CreatureScript
 {
     public:
-
-        boss_high_botanist_freywinn()
-            : CreatureScript("boss_high_botanist_freywinn")
-        {
-        }
+        boss_high_botanist_freywinn() : CreatureScript("boss_high_botanist_freywinn") { }
 
         struct boss_high_botanist_freywinnAI : public BossAI
         {

diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp
@@ -225,7 +225,7 @@ class spell_warr_deep_wounds : public SpellScriptLoader
                             _player->CastSpell(target, SPELL_WARRIOR_DEEP_WOUNDS, true);
 
                     // Item - Warrior T16 DPS 4P Bonus - 144441
-                    if (GetSpellInfo()->Id == SPELL_WARRIOR_MORTAL_STRIKE_AURA || GetSpellInfo()->Id == SPELL_WARRIOR_BLOODTHIRST)
+                    if (GetSpellInfo()->Id == SPELL_WARRIOR_MORTAL_STRIKE_AURA || GetSpellInfo()->Id == SPELL_WARRIOR_BLOODTHIRST_DAMAGE)
                         if (_player->HasAura(SPELL_WARRIOR_T16_DPS_4P_BONUS))
                             if (roll_chance_i(10))
                                 _player->CastSpell(_player, SPELL_WARRIOR_T16_DPS_4P_BONUS_PROC, true);

diff --git a/src/server/scripts/World/mob_generic_creature.cpp b/src/server/scripts/World/mob_generic_creature.cpp
@@ -151,7 +151,6 @@ class generic_creature : public CreatureScript
 
                         //Set our global cooldown
                         GlobalCooldown = GENERIC_CREATURE_COOLDOWN;
-
                     }//If no spells available and we arn't moving run to target
                     else if (IsSelfRooted)
                     {

diff --git a/src/server/shared/Threading/Threading.cpp b/src/server/shared/Threading/Threading.cpp
@@ -98,10 +98,7 @@ int ThreadPriority::getPriority(Priority p) const
 
 #define THREADFLAG (THR_NEW_LWP | THR_SCHED_DEFAULT| THR_JOINABLE)
 
-Thread::Thread(): m_iThreadId(0), m_hThreadHandle(0), m_task(0)
-{
-
-}
+Thread::Thread(): m_iThreadId(0), m_hThreadHandle(0), m_task(0) { }
 
 Thread::Thread(Runnable* instance): m_iThreadId(0), m_hThreadHandle(0), m_task(instance)
 {

diff --git a/src/server/shared/Utilities/ServiceWin32.cpp b/src/server/shared/Utilities/ServiceWin32.cpp
@@ -115,7 +115,6 @@ bool WinServiceInstall()
                     &sfa);                                  // new data
 
                 CloseServiceHandle(service);
-
             }
         }
         CloseServiceHandle(serviceControlManager);

diff --git a/src/server/shared/Utilities/Timer.h b/src/server/shared/Utilities/Timer.h
@@ -46,11 +46,7 @@ inline uint32 GetMSTimeDiffToNow(uint32 oldMSTime)
 struct IntervalTimer
 {
     public:
-
-        IntervalTimer()
-            : _interval(0), _current(0)
-        {
-        }
+        IntervalTimer() : _interval(0), _current(0) { }
 
         void Update(time_t diff)
         {
@@ -91,19 +87,14 @@ struct IntervalTimer
         }
 
     private:
-
         time_t _interval;
         time_t _current;
 };
 
 struct TimeTracker
 {
     public:
-
-        TimeTracker(time_t expiry)
-            : i_expiryTime(expiry)
-        {
-        }
+        TimeTracker(time_t expiry) : i_expiryTime(expiry) { }
 
         void Update(time_t diff)
         {
@@ -126,18 +117,13 @@ struct TimeTracker
         }
 
     private:
-
         time_t i_expiryTime;
 };
 
 struct TimeTrackerSmall
 {
     public:
-
-        TimeTrackerSmall(uint32 expiry = 0)
-            : i_expiryTime(expiry)
-        {
-        }
+        TimeTrackerSmall(uint32 expiry = 0) : i_expiryTime(expiry) { }
 
         void Update(int32 diff)
         {
@@ -160,18 +146,13 @@ struct TimeTrackerSmall
         }
 
     private:
-
         int32 i_expiryTime;
 };
 
 struct PeriodicTimer
 {
     public:
-
-        PeriodicTimer(int32 period, int32 start_time)
-            : i_period(period), i_expireTime(start_time)
-        {
-        }
+        PeriodicTimer(int32 period, int32 start_time) : i_period(period), i_expireTime(start_time) { }
 
         bool Update(const uint32 diff)
         {
@@ -194,7 +175,6 @@ struct PeriodicTimer
         void TReset(int32 diff, int32 period)  { i_expireTime += period > diff ? period : diff; }
 
     private:
-
         int32 i_period;
         int32 i_expireTime;
 };