Core/Misc: Random changes here and there to minimize differences with 4.3.4 branch

7 files changed, 10 insertions, 11 deletions

diff --git a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
index 660b8f6c460..1fa5cc9c5af 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
@@ -226,7 +226,6 @@ public:
 
             if (text)
                  CreatureAI::Talk(text);
-            
         }
 
         void PrepareEncounter()
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
index 22a26fd4389..84d0cd6b4c4 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp
@@ -178,7 +178,7 @@ public:
         {
             if (!instance)
                 return;
-            
+
             instance->SetData(DATA_KAELTHAS_EVENT, IN_PROGRESS);
         }
 
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
index c8bf50c0bcc..c142a0c30d7 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
@@ -150,7 +150,7 @@ public:
                         HandleGameObject(SelinEncounterDoorGUID, false);
                     else if (data == NOT_STARTED)
                         HandleGameObject(SelinEncounterDoorGUID, true);
-                        
+
                     Encounter[0] = data;
                     break;
                 case DATA_VEXALLUS_EVENT:
@@ -184,7 +184,7 @@ public:
                     StatuesState = data;
                     break;
             }
-            
+
             SaveToDB();
         }
 
@@ -245,7 +245,7 @@ public:
             OUT_SAVE_INST_DATA_COMPLETE;
             return saveStream.str();
         }
-        
+
         void Load(const char* str)
         {
             if (!str)
@@ -257,7 +257,7 @@ public:
             OUT_LOAD_INST_DATA(str);
 
             std::istringstream loadStream(str);
-            
+
             for (uint32 i = 0; i < MAX_ENCOUNTER; ++i)
             {
                 uint32 tmpState;
@@ -272,7 +272,7 @@ public:
 
             OUT_LOAD_INST_DATA_COMPLETE;
         }
-            
+
         uint64 GetData64(uint32 identifier) const
         {
             switch (identifier)
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
index 2b21bb26804..7ceb86dd980 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
@@ -141,7 +141,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 78a5f3797d8..2ff3dcd5e32 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 c2552963b0e..b32f9244034 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,