Core/Misc: Tab2spaces, remove trailing whitespaces and remove dupe code after merge

9 files changed, 15 insertions, 18 deletions

diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp
index b0ad965f310..6431f8a3479 100644
--- a/src/server/game/Battlefield/Battlefield.cpp
+++ b/src/server/game/Battlefield/Battlefield.cpp
@@ -918,7 +918,7 @@ bool BfCapturePoint::HandlePlayerEnter(Player* player)
             player->SendUpdateWorldState(capturePoint->GetGOInfo()->capturePoint.worldstate3, m_neutralValuePct);
         }
     }
-    
+
     return m_activePlayers[player->GetTeamId()].insert(player->GetGUID()).second;
 }
 
@@ -941,7 +941,7 @@ void BfCapturePoint::SendChangePhase()
 {
     if (!m_capturePointGUID)
         return;
-        
+
     if (GameObject* capturePoint = m_Bf->GetGameObject(m_capturePointGUID))
     {
         // send this too, sometimes the slider disappears, dunno why :(
@@ -989,9 +989,9 @@ bool BfCapturePoint::SetCapturePointData(GameObject* capturePoint)
     return true;
 }
 
-GameObject* BfCapturePoint::GetCapturePointGo() 
-{ 
-    return m_Bf->GetGameObject(m_capturePointGUID); 
+GameObject* BfCapturePoint::GetCapturePointGo()
+{
+    return m_Bf->GetGameObject(m_capturePointGUID);
 }
 
 bool BfCapturePoint::DelCapturePoint()
@@ -1039,13 +1039,13 @@ bool BfCapturePoint::Update(uint32 diff)
         Trinity::AnyPlayerInObjectRangeCheck checker(capturePoint, radius);
         Trinity::PlayerListSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(capturePoint, players, checker);
         capturePoint->VisitNearbyWorldObject(radius, searcher);
-    
+
         for (std::list<Player*>::iterator itr = players.begin(); itr != players.end(); ++itr)
             if ((*itr)->IsOutdoorPvPActive())
                 if (m_activePlayers[(*itr)->GetTeamId()].insert((*itr)->GetGUID()).second)
                     HandlePlayerEnter(*itr);
     }
-    
+
     // get the difference of numbers
     float fact_diff = ((float) m_activePlayers[0].size() - (float) m_activePlayers[1].size()) * diff / BATTLEFIELD_OBJECTIVE_UPDATE_INTERVAL;
     if (G3D::fuzzyEq(fact_diff, 0.0f))
diff --git a/src/server/game/Battlefield/Battlefield.h b/src/server/game/Battlefield/Battlefield.h
index f17a7666d67..cccdf320d89 100644
--- a/src/server/game/Battlefield/Battlefield.h
+++ b/src/server/game/Battlefield/Battlefield.h
@@ -106,7 +106,7 @@ class BfCapturePoint
         bool SetCapturePointData(GameObject* capturePoint);
         GameObject* GetCapturePointGo();
         uint32 GetCapturePointEntry(){ return m_capturePointEntry; }
-        
+
         TeamId GetTeamId() { return m_team; }
     protected:
         bool DelCapturePoint();
@@ -294,7 +294,7 @@ class Battlefield : public ZoneScript
 
         Creature* GetCreature(uint64 GUID);
         GameObject* GetGameObject(uint64 GUID);
-        
+
         // Script-methods
 
         /// Called on start
diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.h b/src/server/game/Battlefield/Zones/BattlefieldWG.h
index 73ec858e965..0ac87af94ba 100644
--- a/src/server/game/Battlefield/Zones/BattlefieldWG.h
+++ b/src/server/game/Battlefield/Zones/BattlefieldWG.h
@@ -1201,7 +1201,7 @@ struct BfWGGameObjectBuilding
     {
         if (!go)
             return;
-        
+
         // GameObject associated to object
         m_BuildGUID = go->GetGUID();
 
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 458b4ea7706..41d48cbfc02 100755
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -1721,9 +1721,6 @@ SpellInfo const* Creature::reachWithSpellAttack(Unit* victim)
         if (bcontinue)
             continue;
 
-        if (bcontinue)
-             continue;
-
         if (spellInfo->ManaCost > (uint32)GetPower(POWER_MANA))
             continue;
         float range = spellInfo->GetMaxRange(false);
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
index 660b8f6c460..da6fdb2d0e3 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
@@ -226,7 +226,7 @@ public:
 
             if (text)
                  CreatureAI::Talk(text);
-            
+
         }
 
         void PrepareEncounter()
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
index 78fc8d127b2..1bfcb4adf6a 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
@@ -171,7 +171,7 @@ public:
                     ++speechCounter;
                     DoCastAOE(SPELL_THREAT_PULSE, true);
 
-                } else 
+                } else
                     speechTimer -= diff;
 
                 return;
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
index 5bedf1e99b2..5422d3812f1 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
@@ -34,7 +34,7 @@ EndScriptData */
 //this texts are already used by 3975 and 3976
 enum Says
 {
-    SAY_LOST_HEAD               = 0,    
+    SAY_LOST_HEAD               = 0,
     SAY_PLAYER_DEATH            = 1,
 
     SAY_ENTRANCE                = 0,
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
index c7db80c7f22..c2dc7123f6d 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
@@ -54,7 +54,7 @@ enum Spells
     AURA_SPECTRAL_REALM                         = 46021,
     AURA_SPECTRAL_INVISIBILITY                  = 44801,
     AURA_DEMONIC_VISUAL                         = 44800,
-    
+
     SPELL_SPECTRAL_BLAST                        = 44869,
     SPELL_TELEPORT_SPECTRAL                     = 46019,
     SPELL_ARCANE_BUFFET                         = 45018,
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
index 814588fdf68..4c724c1c1a1 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
@@ -34,7 +34,7 @@ EndScriptData */
 enum Yells
 {
     SAY_KJ_OFFCOMBAT                            = 0,
-    
+
     SAY_KALECGOS_ENCOURAGE                      = 0,
     SAY_KALECGOS_READY1                         = 1,
     SAY_KALECGOS_READY2                         = 2,