refactor(Core): sort #includes alphabetically (#4579)

2021-02-24 22:34:42 +01:00 · 2021-02-24 22:34:42 +01:00 · dbc0ff6554
commit dbc0ff6554
parent 51342ef9b5
839 changed files with 3120 additions and 3157 deletions
--- a/src/server/game/AI/CoreAI/CombatAI.cpp
+++ b/src/server/game/AI/CoreAI/CombatAI.cpp
@ -5,11 +5,11 @@
 */

 #include "CombatAI.h"
-#include "SpellMgr.h"
-#include "SpellInfo.h"
-#include "Vehicle.h"
 #include "ObjectAccessor.h"
 #include "Player.h"
+#include "SpellInfo.h"
+#include "SpellMgr.h"
+#include "Vehicle.h"

 /////////////////
 // AggressorAI
--- a/src/server/game/AI/CoreAI/CombatAI.h
+++ b/src/server/game/AI/CoreAI/CombatAI.h
@ -7,9 +7,9 @@
 #ifndef ACORE_COMBATAI_H
 #define ACORE_COMBATAI_H

+#include "ConditionMgr.h"
 #include "CreatureAI.h"
 #include "CreatureAIImpl.h"
-#include "ConditionMgr.h"

 class Creature;

--- a/src/server/game/AI/CoreAI/GameObjectAI.h
+++ b/src/server/game/AI/CoreAI/GameObjectAI.h
@ -7,12 +7,12 @@
 #ifndef ACORE_GAMEOBJECTAI_H
 #define ACORE_GAMEOBJECTAI_H

+#include "CreatureAI.h"
 #include "Define.h"
-#include <list>
+#include "GameObject.h"
 #include "Object.h"
 #include "QuestDef.h"
-#include "GameObject.h"
-#include "CreatureAI.h"
+#include <list>

 class GameObjectAI
 {
--- a/src/server/game/AI/CoreAI/GuardAI.cpp
+++ b/src/server/game/AI/CoreAI/GuardAI.cpp
@ -4,12 +4,12 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "GuardAI.h"
-#include "Errors.h"
-#include "Player.h"
-#include "ObjectAccessor.h"
-#include "World.h"
 #include "CreatureAIImpl.h"
+#include "Errors.h"
+#include "GuardAI.h"
+#include "ObjectAccessor.h"
+#include "Player.h"
+#include "World.h"

 int GuardAI::Permissible(Creature const* creature)
 {
--- a/src/server/game/AI/CoreAI/PassiveAI.cpp
+++ b/src/server/game/AI/CoreAI/PassiveAI.cpp
@ -4,8 +4,8 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "PassiveAI.h"
 #include "Creature.h"
+#include "PassiveAI.h"
 #include "TemporarySummon.h"

 PassiveAI::PassiveAI(Creature* c) : CreatureAI(c) { me->SetReactState(REACT_PASSIVE); }
--- a/src/server/game/AI/CoreAI/PetAI.cpp
+++ b/src/server/game/AI/CoreAI/PetAI.cpp
@ -4,20 +4,20 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "PetAI.h"
-#include "Errors.h"
-#include "Pet.h"
-#include "Player.h"
-#include "DBCStores.h"
-#include "Spell.h"
-#include "ObjectAccessor.h"
-#include "SpellMgr.h"
 #include "Creature.h"
-#include "World.h"
-#include "Util.h"
+#include "DBCStores.h"
+#include "Errors.h"
 #include "Group.h"
-#include "SpellInfo.h"
+#include "ObjectAccessor.h"
+#include "Pet.h"
+#include "PetAI.h"
+#include "Player.h"
+#include "Spell.h"
 #include "SpellAuraEffects.h"
+#include "SpellInfo.h"
+#include "SpellMgr.h"
+#include "Util.h"
+#include "World.h"
 #include "WorldSession.h"

 int PetAI::Permissible(const Creature* creature)
--- a/src/server/game/AI/CoreAI/ReactorAI.cpp
+++ b/src/server/game/AI/CoreAI/ReactorAI.cpp
@ -5,11 +5,11 @@
 */

 #include "ByteBuffer.h"
-#include "ReactorAI.h"
+#include "CreatureAIImpl.h"
 #include "Errors.h"
 #include "Log.h"
 #include "ObjectAccessor.h"
-#include "CreatureAIImpl.h"
+#include "ReactorAI.h"

 int ReactorAI::Permissible(const Creature* creature)
 {
--- a/src/server/game/AI/CoreAI/TotemAI.cpp
+++ b/src/server/game/AI/CoreAI/TotemAI.cpp
@ -4,16 +4,15 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "TotemAI.h"
-#include "Totem.h"
+#include "CellImpl.h"
 #include "Creature.h"
 #include "DBCStores.h"
-#include "ObjectAccessor.h"
-#include "SpellMgr.h"
-
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
-#include "CellImpl.h"
+#include "ObjectAccessor.h"
+#include "SpellMgr.h"
+#include "Totem.h"
+#include "TotemAI.h"

 int TotemAI::Permissible(Creature const* creature)
 {
--- a/src/server/game/AI/CoreAI/UnitAI.cpp
+++ b/src/server/game/AI/CoreAI/UnitAI.cpp
@ -4,15 +4,15 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "UnitAI.h"
-#include "Player.h"
 #include "Creature.h"
-#include "SpellAuras.h"
-#include "SpellAuraEffects.h"
-#include "SpellMgr.h"
-#include "SpellInfo.h"
-#include "Spell.h"
 #include "CreatureAIImpl.h"
+#include "Player.h"
+#include "Spell.h"
+#include "SpellAuraEffects.h"
+#include "SpellAuras.h"
+#include "SpellInfo.h"
+#include "SpellMgr.h"
+#include "UnitAI.h"

 void UnitAI::AttackStart(Unit* victim)
 {
--- a/src/server/game/AI/CoreAI/UnitAI.h
+++ b/src/server/game/AI/CoreAI/UnitAI.h
@ -7,9 +7,9 @@
 #ifndef ACORE_UNITAI_H
 #define ACORE_UNITAI_H

+#include "Containers.h"
 #include "Define.h"
 #include "Unit.h"
-#include "Containers.h"
 #include <list>

 class Player;
--- a/src/server/game/AI/CreatureAI.cpp
+++ b/src/server/game/AI/CreatureAI.cpp
@ -4,16 +4,16 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

+#include "Creature.h"
 #include "CreatureAI.h"
 #include "CreatureAIImpl.h"
-#include "Creature.h"
-#include "World.h"
-#include "SpellMgr.h"
-#include "Vehicle.h"
+#include "CreatureTextMgr.h"
 #include "Log.h"
 #include "MapReference.h"
 #include "Player.h"
-#include "CreatureTextMgr.h"
+#include "SpellMgr.h"
+#include "Vehicle.h"
+#include "World.h"

 //Disable CreatureAI when charmed
 void CreatureAI::OnCharmed(bool /*apply*/)
--- a/src/server/game/AI/CreatureAI.h
+++ b/src/server/game/AI/CreatureAI.h
@ -7,9 +7,9 @@
 #ifndef ACORE_CREATUREAI_H
 #define ACORE_CREATUREAI_H

+#include "Common.h"
 #include "Creature.h"
 #include "UnitAI.h"
-#include "Common.h"

 class WorldObject;
 class Unit;
--- a/src/server/game/AI/CreatureAIFactory.h
+++ b/src/server/game/AI/CreatureAIFactory.h
@ -6,9 +6,9 @@
 #ifndef ACORE_CREATUREAIFACTORY_H
 #define ACORE_CREATUREAIFACTORY_H

-#include "ObjectRegistry.h"
 #include "FactoryHolder.h"
 #include "GameObjectAI.h"
+#include "ObjectRegistry.h"

 struct SelectableAI : public FactoryHolder<CreatureAI>, public Permissible<Creature>
 {
--- a/src/server/game/AI/CreatureAIImpl.h
+++ b/src/server/game/AI/CreatureAIImpl.h
@ -7,11 +7,10 @@
 #define CREATUREAIIMPL_H

 #include "Common.h"
-#include "Define.h"
-#include "TemporarySummon.h"
 #include "CreatureAI.h"
+#include "Define.h"
 #include "SpellMgr.h"
-
+#include "TemporarySummon.h"
 #include <functional>
 #include <type_traits>

--- a/src/server/game/AI/CreatureAIRegistry.cpp
+++ b/src/server/game/AI/CreatureAIRegistry.cpp
@ -4,20 +4,19 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "PassiveAI.h"
-#include "ReactorAI.h"
 #include "CombatAI.h"
-#include "GuardAI.h"
-#include "PetAI.h"
-#include "TotemAI.h"
-#include "RandomMovementGenerator.h"
-#include "MovementGeneratorImpl.h"
-#include "CreatureAIRegistry.h"
-#include "WaypointMovementGenerator.h"
 #include "CreatureAIFactory.h"
+#include "CreatureAIRegistry.h"
+#include "GuardAI.h"
+#include "MovementGeneratorImpl.h"
+#include "PassiveAI.h"
+#include "PetAI.h"
+#include "RandomMovementGenerator.h"
+#include "ReactorAI.h"
 #include "SmartAI.h"
+#include "TotemAI.h"
+#include "WaypointMovementGenerator.h"

-//#include "CreatureAIImpl.h"
 namespace AIRegistry
 {
    void Initialize()
--- a/src/server/game/AI/CreatureAISelector.cpp
+++ b/src/server/game/AI/CreatureAISelector.cpp
@ -5,14 +5,13 @@
 */

 #include "Creature.h"
-#include "CreatureAISelector.h"
-#include "PassiveAI.h"
-
-#include "MovementGenerator.h"
-#include "Pet.h"
-#include "TemporarySummon.h"
 #include "CreatureAIFactory.h"
+#include "CreatureAISelector.h"
+#include "MovementGenerator.h"
+#include "PassiveAI.h"
+#include "Pet.h"
 #include "ScriptMgr.h"
+#include "TemporarySummon.h"

 namespace FactorySelector
 {
--- a/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
@ -5,14 +5,14 @@
 * This program is free software licensed under GPL version 2
 * Please see the included DOCS/LICENSE.TXT for more information */

-#include "ScriptedCreature.h"
-#include "Item.h"
-#include "Spell.h"
-#include "GridNotifiers.h"
-#include "GridNotifiersImpl.h"
 #include "Cell.h"
 #include "CellImpl.h"
+#include "GridNotifiers.h"
+#include "GridNotifiersImpl.h"
+#include "Item.h"
 #include "ObjectMgr.h"
+#include "ScriptedCreature.h"
+#include "Spell.h"
 #include "TemporarySummon.h"

 // Spell summary for ScriptedAI::SelectSpell
--- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
@ -10,10 +10,10 @@ SDComment:
 SDCategory: Npc
 EndScriptData */

-#include "ScriptedCreature.h"
-#include "ScriptedEscortAI.h"
 #include "Group.h"
 #include "Player.h"
+#include "ScriptedCreature.h"
+#include "ScriptedEscortAI.h"

 enum ePoints
 {
--- a/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h
+++ b/src/server/game/AI/ScriptedAI/ScriptedEscortAI.h
@ -7,6 +7,7 @@
 #define SC_ESCORTAI_H

 #include "ScriptSystem.h"
+#include "ScriptedCreature.h"

 #define DEFAULT_MAX_PLAYER_DISTANCE 50

--- a/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedFollowerAI.cpp
@ -10,10 +10,10 @@ SDComment: This AI is under development
 SDCategory: Npc
 EndScriptData */

-#include "ScriptedCreature.h"
-#include "ScriptedFollowerAI.h"
 #include "Group.h"
 #include "Player.h"
+#include "ScriptedCreature.h"
+#include "ScriptedFollowerAI.h"

 const float MAX_PLAYER_DISTANCE = 100.0f;

--- a/src/server/game/AI/ScriptedAI/ScriptedGossip.cpp
+++ b/src/server/game/AI/ScriptedAI/ScriptedGossip.cpp
@ -4,9 +4,9 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "ScriptedGossip.h"
-#include "Player.h"
 #include "Creature.h"
+#include "Player.h"
+#include "ScriptedGossip.h"

 void ClearGossipMenuFor(Player* player)
 {
--- a/src/server/game/AI/SmartScripts/SmartAI.cpp
+++ b/src/server/game/AI/SmartScripts/SmartAI.cpp
@ -4,20 +4,20 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "DatabaseEnv.h"
-#include "ObjectMgr.h"
-#include "ObjectDefines.h"
-#include "GridDefines.h"
-#include "GridNotifiers.h"
-#include "SpellMgr.h"
-#include "GridNotifiersImpl.h"
 #include "Cell.h"
 #include "CellImpl.h"
-#include "InstanceScript.h"
-#include "ScriptedCreature.h"
+#include "DatabaseEnv.h"
+#include "GridDefines.h"
+#include "GridNotifiers.h"
+#include "GridNotifiersImpl.h"
 #include "Group.h"
-#include "SmartAI.h"
+#include "InstanceScript.h"
+#include "ObjectDefines.h"
+#include "ObjectMgr.h"
+#include "ScriptedCreature.h"
 #include "ScriptMgr.h"
+#include "SmartAI.h"
+#include "SpellMgr.h"
 #include "Vehicle.h"

 SmartAI::SmartAI(Creature* c) : CreatureAI(c)
--- a/src/server/game/AI/SmartScripts/SmartAI.h
+++ b/src/server/game/AI/SmartScripts/SmartAI.h
@ -10,12 +10,11 @@
 #include "Common.h"
 #include "Creature.h"
 #include "CreatureAI.h"
-#include "Unit.h"
-#include "Spell.h"
-
+#include "GameObjectAI.h"
 #include "SmartScript.h"
 #include "SmartScriptMgr.h"
-#include "GameObjectAI.h"
+#include "Spell.h"
+#include "Unit.h"

 enum SmartEscortState
 {
--- a/src/server/game/AI/SmartScripts/SmartScript.cpp
+++ b/src/server/game/AI/SmartScripts/SmartScript.cpp
@ -4,9 +4,9 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "Chat.h"
 #include "Cell.h"
 #include "CellImpl.h"
+#include "Chat.h"
 #include "CreatureTextMgr.h"
 #include "DatabaseEnv.h"
 #include "GameEventMgr.h"
--- a/src/server/game/AI/SmartScripts/SmartScript.h
+++ b/src/server/game/AI/SmartScripts/SmartScript.h
@ -10,12 +10,10 @@
 #include "Common.h"
 #include "Creature.h"
 #include "CreatureAI.h"
-#include "Unit.h"
-#include "Spell.h"
 #include "GridNotifiers.h"
-
 #include "SmartScriptMgr.h"
-//#include "SmartAI.h"
+#include "Spell.h"
+#include "Unit.h"

 class SmartScript
 {
--- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
+++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
@ -4,21 +4,20 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "DatabaseEnv.h"
-#include "ObjectMgr.h"
-#include "ObjectDefines.h"
-#include "GridDefines.h"
-#include "GridNotifiers.h"
-#include "SpellMgr.h"
-#include "GridNotifiersImpl.h"
 #include "Cell.h"
 #include "CellImpl.h"
-#include "InstanceScript.h"
-#include "ScriptedCreature.h"
-#include "GameEventMgr.h"
 #include "CreatureTextMgr.h"
-
+#include "DatabaseEnv.h"
+#include "GameEventMgr.h"
+#include "GridDefines.h"
+#include "GridNotifiers.h"
+#include "GridNotifiersImpl.h"
+#include "InstanceScript.h"
+#include "ObjectDefines.h"
+#include "ObjectMgr.h"
+#include "ScriptedCreature.h"
 #include "SmartScriptMgr.h"
+#include "SpellMgr.h"

 SmartWaypointMgr* SmartWaypointMgr::instance()
 {
--- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h
+++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h
@ -10,11 +10,10 @@
 #include "Common.h"
 #include "Creature.h"
 #include "CreatureAI.h"
-#include "Unit.h"
 #include "Spell.h"
-
-//#include "SmartScript.h"
 //#include "SmartAI.h"
+//#include "SmartScript.h"
+#include "Unit.h"

 struct WayPoint
 {
--- a/src/server/game/Accounts/AccountMgr.cpp
+++ b/src/server/game/Accounts/AccountMgr.cpp
@ -9,8 +9,8 @@
 #include "ObjectAccessor.h"
 #include "Player.h"
 #include "ScriptMgr.h"
-#include "Util.h"
 #include "SHA1.h"
+#include "Util.h"
 #include "WorldSession.h"

 namespace AccountMgr
--- a/src/server/game/Achievements/AchievementMgr.cpp
+++ b/src/server/game/Achievements/AchievementMgr.cpp
@ -4,12 +4,12 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "AchievementMgr.h"
 #include "AccountMgr.h"
+#include "AchievementMgr.h"
 #include "ArenaTeam.h"
 #include "ArenaTeamMgr.h"
-#include "BattlegroundAB.h"
 #include "Battleground.h"
+#include "BattlegroundAB.h"
 #include "CellImpl.h"
 #include "Chat.h"
 #include "Common.h"
--- a/src/server/game/ArenaSpectator/ArenaSpectator.h
+++ b/src/server/game/ArenaSpectator/ArenaSpectator.h
@ -2,15 +2,15 @@
 #ifndef AZEROTHCORE_ARENASPECTATOR_H
 #define AZEROTHCORE_ARENASPECTATOR_H

-#include "Player.h"
-#include "World.h"
-#include "Map.h"
 #include "Battleground.h"
-#include "Pet.h"
-#include "SpellAuras.h"
-#include "SpellAuraEffects.h"
 #include "Chat.h"
 #include "LFGMgr.h"
+#include "Map.h"
+#include "Pet.h"
+#include "Player.h"
+#include "SpellAuraEffects.h"
+#include "SpellAuras.h"
+#include "World.h"

 #define SPECTATOR_ADDON_VERSION 27
 #define SPECTATOR_BUFFER_LEN 150
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
@ -4,23 +4,23 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

+#include "AccountMgr.h"
+#include "AsyncAuctionListing.h"
+#include "AuctionHouseMgr.h"
+#include "AvgDiffTracker.h"
 #include "Common.h"
-#include "ObjectMgr.h"
-#include "Player.h"
-#include "World.h"
-#include "WorldPacket.h"
-#include "WorldSession.h"
 #include "DatabaseEnv.h"
 #include "DBCStores.h"
-#include "ScriptMgr.h"
-#include "AccountMgr.h"
-#include "AuctionHouseMgr.h"
 #include "Item.h"
 #include "Language.h"
 #include "Logging/Log.h"
+#include "ObjectMgr.h"
+#include "Player.h"
+#include "ScriptMgr.h"
+#include "World.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"
 #include <vector>
-#include "AvgDiffTracker.h"
-#include "AsyncAuctionListing.h"

 enum eAuctionHouse
 {
--- a/src/server/game/Battlefield/Battlefield.cpp
+++ b/src/server/game/Battlefield/Battlefield.cpp
@ -6,21 +6,21 @@

 #include "Battlefield.h"
 #include "BattlefieldMgr.h"
-#include "ObjectAccessor.h"
-#include "ObjectMgr.h"
-#include "Map.h"
-#include "MapManager.h"
-#include "Group.h"
-#include "WorldPacket.h"
-#include "GridNotifiers.h"
-#include "GridNotifiersImpl.h"
-#include "GridNotifiers.h"
-#include "GridNotifiersImpl.h"
 #include "CellImpl.h"
 #include "CreatureTextMgr.h"
-#include "GroupMgr.h"
-#include "Transport.h"
 #include "GameGraveyard.h"
+#include "GridNotifiers.h"
+#include "GridNotifiers.h"
+#include "GridNotifiersImpl.h"
+#include "GridNotifiersImpl.h"
+#include "Group.h"
+#include "GroupMgr.h"
+#include "Map.h"
+#include "MapManager.h"
+#include "ObjectAccessor.h"
+#include "ObjectMgr.h"
+#include "Transport.h"
+#include "WorldPacket.h"

 Battlefield::Battlefield()
 {
--- a/src/server/game/Battlefield/Battlefield.h
+++ b/src/server/game/Battlefield/Battlefield.h
@ -7,13 +7,13 @@
 #ifndef BATTLEFIELD_H_
 #define BATTLEFIELD_H_

-#include "Utilities/Util.h"
-#include "SharedDefines.h"
-#include "ZoneScript.h"
-#include "WorldPacket.h"
-#include "GameObject.h"
 #include "Battleground.h"
+#include "GameObject.h"
 #include "ObjectAccessor.h"
+#include "SharedDefines.h"
+#include "Utilities/Util.h"
+#include "WorldPacket.h"
+#include "ZoneScript.h"

 enum BattlefieldTypes
 {
--- a/src/server/game/Battlefield/BattlefieldHandler.cpp
+++ b/src/server/game/Battlefield/BattlefieldHandler.cpp
@ -4,16 +4,15 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

+#include "Battlefield.h"
+#include "BattlefieldMgr.h"
 #include "Common.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
-#include "WorldPacket.h"
-#include "WorldSession.h"
-
-#include "Battlefield.h"
-#include "BattlefieldMgr.h"
 #include "Opcodes.h"
 #include "Player.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"

 //This send to player windows for invite player to join the war
 //Param1:(BattleId) the BattleId of Bf
--- a/src/server/game/Battlefield/BattlefieldMgr.cpp
+++ b/src/server/game/Battlefield/BattlefieldMgr.cpp
@ -5,9 +5,9 @@
 */

 #include "BattlefieldMgr.h"
-#include "Zones/BattlefieldWG.h"
 #include "ObjectMgr.h"
 #include "Player.h"
+#include "Zones/BattlefieldWG.h"

 BattlefieldMgr::BattlefieldMgr()
 {
--- a/src/server/game/Battlefield/Zones/BattlefieldWG.h
+++ b/src/server/game/Battlefield/Zones/BattlefieldWG.h
@ -7,10 +7,10 @@
 #ifndef BATTLEFIELD_WG_
 #define BATTLEFIELD_WG_

-#include "ObjectAccessor.h"
-#include "WorldPacket.h"
 #include "Battlefield.h"
+#include "ObjectAccessor.h"
 #include "World.h"
+#include "WorldPacket.h"

 class Group;
 class BattlefieldWG;
--- a/src/server/game/Battlegrounds/ArenaTeam.cpp
+++ b/src/server/game/Battlegrounds/ArenaTeam.cpp
@ -4,17 +4,17 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "ObjectMgr.h"
-#include "WorldPacket.h"
 #include "ArenaTeam.h"
-#include "World.h"
-#include "Group.h"
 #include "ArenaTeamMgr.h"
-#include "Player.h"
-#include "WorldSession.h"
-#include "Opcodes.h"
-#include "ScriptMgr.h"
 #include "BattlegroundMgr.h"
+#include "Group.h"
+#include "ObjectMgr.h"
+#include "Opcodes.h"
+#include "Player.h"
+#include "ScriptMgr.h"
+#include "World.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"

 ArenaTeam::ArenaTeam()
    : TeamId(0), Type(0), TeamName(), CaptainGuid(0), BackgroundColor(0), EmblemStyle(0), EmblemColor(0),
--- a/src/server/game/Battlegrounds/ArenaTeam.h
+++ b/src/server/game/Battlegrounds/ArenaTeam.h
@ -7,8 +7,8 @@
 #ifndef AZEROTHCORE_ARENATEAM_H
 #define AZEROTHCORE_ARENATEAM_H

-#include "QueryResult.h"
 #include "Map.h"
+#include "QueryResult.h"
 #include <list>
 #include <map>

--- a/src/server/game/Battlegrounds/ArenaTeamMgr.cpp
+++ b/src/server/game/Battlegrounds/ArenaTeamMgr.cpp
@ -4,15 +4,15 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "Define.h"
 #include "ArenaTeamMgr.h"
-#include "World.h"
-#include "Log.h"
 #include "DatabaseEnv.h"
+#include "Define.h"
 #include "Language.h"
+#include "Log.h"
 #include "ObjectAccessor.h"
 #include "Player.h"
 #include "ScriptMgr.h"
+#include "World.h"

 ArenaTeamMgr::ArenaTeamMgr()
 {
--- a/src/server/game/Battlegrounds/Battleground.cpp
+++ b/src/server/game/Battlegrounds/Battleground.cpp
@ -4,13 +4,20 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

+#include "ArenaSpectator.h"
 #include "ArenaTeam.h"
 #include "ArenaTeamMgr.h"
 #include "Battleground.h"
+#include "BattlegroundBE.h"
+#include "BattlegroundDS.h"
 #include "BattlegroundMgr.h"
-#include "Creature.h"
+#include "BattlegroundNA.h"
+#include "BattlegroundRL.h"
+#include "BattlegroundRV.h"
 #include "Chat.h"
+#include "Creature.h"
 #include "Formulas.h"
+#include "GameGraveyard.h"
 #include "GridNotifiersImpl.h"
 #include "Group.h"
 #include "MapManager.h"
@ -19,20 +26,14 @@
 #include "Pet.h"
 #include "Player.h"
 #include "ReputationMgr.h"
+#include "ScriptMgr.h"
 #include "SpellAuraEffects.h"
 #include "SpellAuras.h"
+#include "Transport.h"
 #include "Util.h"
 #include "World.h"
 #include "WorldPacket.h"
-#include "ArenaSpectator.h"
-#include "BattlegroundBE.h"
-#include "BattlegroundDS.h"
-#include "BattlegroundNA.h"
-#include "BattlegroundRL.h"
-#include "BattlegroundRV.h"
-#include "Transport.h"
-#include "ScriptMgr.h"
-#include "GameGraveyard.h"
+
 #ifdef ELUNA
 #include "LuaEngine.h"
 #endif
--- a/src/server/game/Battlegrounds/Battleground.h
+++ b/src/server/game/Battlegrounds/Battleground.h
@ -8,9 +8,9 @@
 #define __BATTLEGROUND_H

 #include "Common.h"
-#include "SharedDefines.h"
 #include "DBCEnums.h"
 #include "GameObject.h"
+#include "SharedDefines.h"

 class Creature;
 class GameObject;
--- a/src/server/game/Battlegrounds/BattlegroundMgr.cpp
+++ b/src/server/game/Battlegrounds/BattlegroundMgr.cpp
@ -4,39 +4,38 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "Common.h"
-#include "ObjectMgr.h"
-#include "ArenaTeamMgr.h"
-#include "World.h"
-#include "WorldPacket.h"
-
 #include "ArenaTeam.h"
-#include "BattlegroundMgr.h"
-#include "BattlegroundAV.h"
+#include "ArenaTeamMgr.h"
 #include "BattlegroundAB.h"
-#include "BattlegroundEY.h"
-#include "BattlegroundWS.h"
-#include "BattlegroundNA.h"
+#include "BattlegroundAV.h"
 #include "BattlegroundBE.h"
-#include "BattlegroundRL.h"
-#include "BattlegroundSA.h"
 #include "BattlegroundDS.h"
-#include "BattlegroundRV.h"
+#include "BattlegroundEY.h"
 #include "BattlegroundIC.h"
+#include "BattlegroundMgr.h"
+#include "BattlegroundNA.h"
+#include "BattlegroundQueue.h"
+#include "BattlegroundRL.h"
+#include "BattlegroundRV.h"
+#include "BattlegroundSA.h"
+#include "BattlegroundWS.h"
 #include "Chat.h"
+#include "Common.h"
+#include "DisableMgr.h"
+#include "Formulas.h"
+#include "GameEventMgr.h"
+#include "GameGraveyard.h"
 #include "Map.h"
 #include "MapInstanced.h"
 #include "MapManager.h"
-#include "Player.h"
-#include "GameEventMgr.h"
-#include "SharedDefines.h"
-#include "Formulas.h"
-#include "DisableMgr.h"
+#include "ObjectMgr.h"
 #include "Opcodes.h"
-#include "BattlegroundQueue.h"
-#include "GameGraveyard.h"
-#include <unordered_map>
+#include "Player.h"
+#include "SharedDefines.h"
+#include "World.h"
+#include "WorldPacket.h"
 #include <random>
+#include <unordered_map>

 #ifdef ELUNA
 #include "LuaEngine.h"
--- a/src/server/game/Battlegrounds/BattlegroundMgr.h
+++ b/src/server/game/Battlegrounds/BattlegroundMgr.h
@ -7,11 +7,11 @@
 #ifndef __BATTLEGROUNDMGR_H
 #define __BATTLEGROUNDMGR_H

-#include "Common.h"
-#include "DBCEnums.h"
 #include "Battleground.h"
 #include "BattlegroundQueue.h"
+#include "Common.h"
 #include "CreatureAIImpl.h"
+#include "DBCEnums.h"
 #include <unordered_map>

 typedef std::map<uint32, Battleground*> BattlegroundContainer;
--- a/src/server/game/Battlegrounds/BattlegroundQueue.cpp
+++ b/src/server/game/Battlegrounds/BattlegroundQueue.cpp
@ -8,13 +8,13 @@
 #include "ArenaTeamMgr.h"
 #include "BattlegroundMgr.h"
 #include "BattlegroundQueue.h"
+#include "Channel.h"
 #include "Chat.h"
 #include "Group.h"
-#include "Log.h"
 #include "Language.h"
+#include "Log.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "Channel.h"
 #include "ScriptMgr.h"
 #include <unordered_map>

--- a/src/server/game/Battlegrounds/BattlegroundQueue.h
+++ b/src/server/game/Battlegrounds/BattlegroundQueue.h
@ -7,11 +7,10 @@
 #ifndef __BATTLEGROUNDQUEUE_H
 #define __BATTLEGROUNDQUEUE_H

+#include "Battleground.h"
 #include "Common.h"
 #include "DBCEnums.h"
-#include "Battleground.h"
 #include "EventProcessor.h"
-
 #include <deque>

 #define COUNT_OF_PLAYERS_TO_AVERAGE_WAIT_TIME 10
--- a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp
@ -3,17 +3,17 @@
 */

 #include "BattlegroundAB.h"
-#include "World.h"
-#include "WorldPacket.h"
-#include "ObjectMgr.h"
 #include "BattlegroundMgr.h"
 #include "Creature.h"
+#include "GameGraveyard.h"
 #include "Language.h"
 #include "Object.h"
+#include "ObjectMgr.h"
 #include "Player.h"
 #include "Util.h"
+#include "World.h"
+#include "WorldPacket.h"
 #include "WorldSession.h"
-#include "GameGraveyard.h"

 BattlegroundAB::BattlegroundAB()
 {
--- a/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
@ -4,18 +4,17 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "ObjectMgr.h"
-#include "WorldPacket.h"
-
 #include "BattlegroundAV.h"
 #include "Formulas.h"
+#include "GameEventMgr.h"
+#include "GameGraveyard.h"
 #include "GameObject.h"
 #include "Language.h"
+#include "ObjectMgr.h"
 #include "Player.h"
 #include "SpellAuras.h"
-#include "GameEventMgr.h"
+#include "WorldPacket.h"
 #include "WorldSession.h"
-#include "GameGraveyard.h"

 BattlegroundAV::BattlegroundAV()
 {
--- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
@ -3,17 +3,17 @@
 */

 #include "BattlegroundEY.h"
-#include "ObjectMgr.h"
-#include "World.h"
-#include "WorldPacket.h"
 #include "BattlegroundMgr.h"
 #include "Creature.h"
+#include "GameGraveyard.h"
 #include "Language.h"
 #include "Object.h"
+#include "ObjectMgr.h"
 #include "Player.h"
 #include "Util.h"
+#include "World.h"
+#include "WorldPacket.h"
 #include "WorldSession.h"
-#include "GameGraveyard.h"

 BattlegroundEY::BattlegroundEY()
 {
--- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h
@ -5,8 +5,8 @@
 #ifndef __BATTLEGROUNDEY_H
 #define __BATTLEGROUNDEY_H

-#include "Language.h"
 #include "Battleground.h"
+#include "Language.h"

 enum BG_EY_Events
 {
--- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp
@ -4,18 +4,18 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "Player.h"
 #include "Battleground.h"
 #include "BattlegroundIC.h"
-#include "Language.h"
-#include "WorldPacket.h"
-#include "GameObject.h"
-#include "ObjectMgr.h"
-#include "Vehicle.h"
-#include "Transport.h"
-#include "WorldSession.h"
-#include "ScriptedCreature.h"
 #include "GameGraveyard.h"
+#include "GameObject.h"
+#include "Language.h"
+#include "ObjectMgr.h"
+#include "Player.h"
+#include "ScriptedCreature.h"
+#include "Transport.h"
+#include "Vehicle.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"

 BattlegroundIC::BattlegroundIC()
 {
--- a/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp
@ -6,13 +6,13 @@

 #include "Battleground.h"
 #include "BattlegroundRV.h"
-#include "ObjectAccessor.h"
+#include "GameObject.h"
 #include "Language.h"
+#include "ObjectAccessor.h"
+#include "Pet.h"
 #include "Player.h"
 #include "WorldPacket.h"
-#include "GameObject.h"
 #include "WorldSession.h"
-#include "Pet.h"

 BattlegroundRV::BattlegroundRV()
 {
--- a/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
@ -5,13 +5,13 @@
 */

 #include "BattlegroundSA.h"
-#include "Language.h"
-#include "Player.h"
+#include "GameGraveyard.h"
 #include "GameObject.h"
+#include "Language.h"
 #include "ObjectMgr.h"
+#include "Player.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "GameGraveyard.h"

 BattlegroundSA::BattlegroundSA()
 {
--- a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp
@ -2,17 +2,17 @@
 * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3
 */

+#include "BattlegroundMgr.h"
 #include "BattlegroundWS.h"
 #include "Creature.h"
+#include "GameGraveyard.h"
 #include "GameObject.h"
 #include "Language.h"
 #include "Object.h"
 #include "ObjectMgr.h"
-#include "BattlegroundMgr.h"
 #include "Player.h"
 #include "World.h"
 #include "WorldPacket.h"
-#include "GameGraveyard.h"

 BattlegroundWS::BattlegroundWS()
 {
--- a/src/server/game/Calendar/CalendarMgr.cpp
+++ b/src/server/game/Calendar/CalendarMgr.cpp
@ -5,12 +5,12 @@
 */

 #include "CalendarMgr.h"
-#include "QueryResult.h"
-#include "Log.h"
-#include "Player.h"
 #include "GuildMgr.h"
+#include "Log.h"
 #include "ObjectAccessor.h"
 #include "Opcodes.h"
+#include "Player.h"
+#include "QueryResult.h"

 CalendarInvite::~CalendarInvite()
 {
--- a/src/server/game/Chat/Channels/Channel.cpp
+++ b/src/server/game/Chat/Channels/Channel.cpp
@ -4,14 +4,14 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

+#include "AccountMgr.h"
 #include "ChannelMgr.h"
 #include "Chat.h"
+#include "DatabaseEnv.h"
 #include "ObjectMgr.h"
+#include "Player.h"
 #include "SocialMgr.h"
 #include "World.h"
-#include "DatabaseEnv.h"
-#include "AccountMgr.h"
-#include "Player.h"

 Channel::Channel(std::string const& name, uint32 channelId, uint32 channelDBId, TeamId teamId, bool announce, bool ownership):
    _announce(announce),
--- a/src/server/game/Chat/Channels/Channel.h
+++ b/src/server/game/Chat/Channels/Channel.h
@ -7,15 +7,13 @@
 #ifndef _CHANNEL_H
 #define _CHANNEL_H

+#include "Common.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"
 #include <list>
 #include <map>
 #include <string>

-#include "Common.h"
-
-#include "WorldSession.h"
-#include "WorldPacket.h"
-
 class Player;

 #define CHANNEL_BAN_DURATION            DAY*60
--- a/src/server/game/Chat/Channels/ChannelMgr.h
+++ b/src/server/game/Chat/Channels/ChannelMgr.h
@ -6,8 +6,8 @@
 #ifndef __ACORE_CHANNELMGR_H
 #define __ACORE_CHANNELMGR_H

-#include "Common.h"
 #include "Channel.h"
+#include "Common.h"
 #include "World.h"
 #include <map>
 #include <string>
--- a/src/server/game/Chat/Chat.cpp
+++ b/src/server/game/Chat/Chat.cpp
@ -4,25 +4,24 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "Common.h"
-#include "ObjectMgr.h"
-#include "World.h"
-#include "WorldPacket.h"
-#include "WorldSession.h"
-#include "DatabaseEnv.h"
-
 #include "AccountMgr.h"
 #include "CellImpl.h"
 #include "Chat.h"
+#include "ChatLink.h"
+#include "Common.h"
+#include "DatabaseEnv.h"
 #include "GridNotifiersImpl.h"
 #include "Language.h"
 #include "Log.h"
+#include "ObjectMgr.h"
 #include "Opcodes.h"
 #include "Player.h"
-#include "UpdateMask.h"
-#include "SpellMgr.h"
 #include "ScriptMgr.h"
-#include "ChatLink.h"
+#include "SpellMgr.h"
+#include "UpdateMask.h"
+#include "World.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"

 #ifdef ELUNA
 #include "LuaEngine.h"
--- a/src/server/game/Chat/Chat.h
+++ b/src/server/game/Chat/Chat.h
@ -9,7 +9,6 @@

 #include "SharedDefines.h"
 #include "WorldSession.h"
-
 #include <vector>

 class ChatHandler;
--- a/src/server/game/Chat/ChatLink.cpp
+++ b/src/server/game/Chat/ChatLink.cpp
@ -5,10 +5,10 @@
 */

 #include "ChatLink.h"
-#include "SpellMgr.h"
+#include "DBCStores.h"
 #include "ObjectMgr.h"
 #include "SpellInfo.h"
-#include "DBCStores.h"
+#include "SpellMgr.h"

 // Supported shift-links (client generated and server side)
 // |color|Hachievement:achievement_id:player_guid:0:0:0:0:0:0:0:0|h[name]|h|r
--- a/src/server/game/Chat/ChatLink.h
+++ b/src/server/game/Chat/ChatLink.h
@ -8,8 +8,8 @@
 #define AZEROTHCORE_CHATLINK_H

 #include "SharedDefines.h"
-#include <sstream>
 #include <list>
+#include <sstream>

 struct ItemLocale;
 struct ItemTemplate;
--- a/src/server/game/Combat/HostileRefManager.cpp
+++ b/src/server/game/Combat/HostileRefManager.cpp
@ -4,12 +4,12 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

+#include "DBCStructure.h"
 #include "HostileRefManager.h"
+#include "SpellInfo.h"
+#include "SpellMgr.h"
 #include "ThreatManager.h"
 #include "Unit.h"
-#include "DBCStructure.h"
-#include "SpellMgr.h"
-#include "SpellInfo.h"

 HostileRefManager::~HostileRefManager()
 {
--- a/src/server/game/Combat/ThreatManager.cpp
+++ b/src/server/game/Combat/ThreatManager.cpp
@ -4,17 +4,17 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "ThreatManager.h"
-#include "Unit.h"
 #include "Creature.h"
 #include "CreatureAI.h"
 #include "Map.h"
-#include "Player.h"
 #include "ObjectAccessor.h"
-#include "UnitEvents.h"
+#include "Player.h"
 #include "SpellAuras.h"
-#include "SpellMgr.h"
 #include "SpellInfo.h"
+#include "SpellMgr.h"
+#include "ThreatManager.h"
+#include "Unit.h"
+#include "UnitEvents.h"

 //==============================================================
 //================= ThreatCalcHelper ===========================
--- a/src/server/game/Combat/ThreatManager.h
+++ b/src/server/game/Combat/ThreatManager.h
@ -8,10 +8,9 @@
 #define _THREATMANAGER

 #include "Common.h"
-#include "SharedDefines.h"
 #include "LinkedReference/Reference.h"
+#include "SharedDefines.h"
 #include "UnitEvents.h"
-
 #include <list>

 //==============================================================
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@ -13,9 +13,9 @@
 #include "ReputationMgr.h"
 #include "ScriptedCreature.h"
 #include "ScriptMgr.h"
+#include "Spell.h"
 #include "SpellAuras.h"
 #include "SpellMgr.h"
-#include "Spell.h"

 // Checks if object meets the condition
 // Can have CONDITION_SOURCE_TYPE_NONE && !mReferenceId if called from a special event (ie: eventAI)
--- a/src/server/game/Conditions/DisableMgr.cpp
+++ b/src/server/game/Conditions/DisableMgr.cpp
@ -7,10 +7,10 @@
 #include "DisableMgr.h"
 #include "ObjectMgr.h"
 #include "OutdoorPvP.h"
-#include "SpellMgr.h"
-#include "VMapManager2.h"
 #include "Player.h"
 #include "SpellInfo.h"
+#include "SpellMgr.h"
+#include "VMapManager2.h"

 namespace DisableMgr
 {
--- a/src/server/game/DataStores/DBCStores.cpp
+++ b/src/server/game/DataStores/DBCStores.cpp
@ -4,20 +4,20 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "DBCStores.h"
+#include "BattlegroundMgr.h"
 #include "DBCFileLoader.h"
 #include "DBCfmt.h"
+#include "DBCStores.h"
 #include "Errors.h"
 #include "Log.h"
 #include "SharedDefines.h"
 #include "SpellMgr.h"
 #include "TransportMgr.h"
-#include "BattlegroundMgr.h"
 #include "World.h"
-#include <map>
 #include <fstream>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
+#include <map>

 typedef std::map<uint16, uint32> AreaFlagByAreaID;
 typedef std::map<uint32, uint32> AreaFlagByMapID;
--- a/src/server/game/DungeonFinding/LFG.cpp
+++ b/src/server/game/DungeonFinding/LFG.cpp
@ -4,8 +4,8 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "LFG.h"
 #include "Language.h"
+#include "LFG.h"
 #include "ObjectMgr.h"

 namespace lfg
--- a/src/server/game/DungeonFinding/LFGMgr.cpp
+++ b/src/server/game/DungeonFinding/LFGMgr.cpp
@ -5,24 +5,24 @@
 */

 #include "Common.h"
-#include "SharedDefines.h"
 #include "DBCStores.h"
 #include "DisableMgr.h"
-#include "ObjectMgr.h"
-#include "SocialMgr.h"
+#include "GameEventMgr.h"
+#include "Group.h"
+#include "GroupMgr.h"
 #include "Language.h"
-#include "LFGMgr.h"
-#include "LFGScripts.h"
 #include "LFGGroupData.h"
+#include "LFGMgr.h"
 #include "LFGPlayerData.h"
 #include "LFGQueue.h"
-#include "Group.h"
-#include "SpellAuras.h"
-#include "Player.h"
-#include "GroupMgr.h"
-#include "GameEventMgr.h"
-#include "WorldSession.h"
+#include "LFGScripts.h"
+#include "ObjectMgr.h"
 #include "Opcodes.h"
+#include "Player.h"
+#include "SharedDefines.h"
+#include "SocialMgr.h"
+#include "SpellAuras.h"
+#include "WorldSession.h"

 namespace lfg
 {
--- a/src/server/game/DungeonFinding/LFGMgr.h
+++ b/src/server/game/DungeonFinding/LFGMgr.h
@ -10,9 +10,9 @@
 #include "DBCStructure.h"
 #include "Field.h"
 #include "LFG.h"
-#include "LFGQueue.h"
 #include "LFGGroupData.h"
 #include "LFGPlayerData.h"
+#include "LFGQueue.h"
 #include "Map.h"

 class Group;
--- a/src/server/game/DungeonFinding/LFGPlayerData.cpp
+++ b/src/server/game/DungeonFinding/LFGPlayerData.cpp
@ -4,8 +4,8 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "LFGPlayerData.h"
 #include "LFGMgr.h"
+#include "LFGPlayerData.h"

 namespace lfg
 {
--- a/src/server/game/DungeonFinding/LFGQueue.cpp
+++ b/src/server/game/DungeonFinding/LFGQueue.cpp
@ -14,17 +14,17 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#include "ObjectDefines.h"
 #include "Containers.h"
-#include "DBCStructure.h"
 #include "DBCStores.h"
+#include "DBCStructure.h"
 #include "Group.h"
-#include "LFGQueue.h"
+#include "GroupMgr.h"
 #include "LFGMgr.h"
+#include "LFGQueue.h"
 #include "Log.h"
+#include "ObjectDefines.h"
 #include "ObjectMgr.h"
 #include "World.h"
-#include "GroupMgr.h"

 namespace lfg
 {
--- a/src/server/game/DungeonFinding/LFGScripts.cpp
+++ b/src/server/game/DungeonFinding/LFGScripts.cpp
@ -9,13 +9,13 @@
 */

 #include "Common.h"
-#include "SharedDefines.h"
-#include "Player.h"
 #include "Group.h"
-#include "LFGScripts.h"
 #include "LFGMgr.h"
-#include "ScriptMgr.h"
+#include "LFGScripts.h"
 #include "ObjectAccessor.h"
+#include "Player.h"
+#include "ScriptMgr.h"
+#include "SharedDefines.h"
 #include "WorldSession.h"

 namespace lfg
--- a/src/server/game/DungeonFinding/LFGScripts.h
+++ b/src/server/game/DungeonFinding/LFGScripts.h
@ -9,8 +9,8 @@
 */

 #include "Common.h"
-#include "SharedDefines.h"
 #include "ScriptMgr.h"
+#include "SharedDefines.h"

 class Player;
 class Group;
--- a/src/server/game/Entities/Corpse/Corpse.cpp
+++ b/src/server/game/Entities/Corpse/Corpse.cpp
@ -6,12 +6,12 @@

 #include "Common.h"
 #include "Corpse.h"
+#include "DatabaseEnv.h"
+#include "GossipDef.h"
+#include "ObjectAccessor.h"
+#include "Opcodes.h"
 #include "Player.h"
 #include "UpdateMask.h"
-#include "ObjectAccessor.h"
-#include "DatabaseEnv.h"
-#include "Opcodes.h"
-#include "GossipDef.h"
 #include "World.h"

 Corpse::Corpse(CorpseType type) : WorldObject(type != CORPSE_BONES), m_type(type)
--- a/src/server/game/Entities/Corpse/Corpse.h
+++ b/src/server/game/Entities/Corpse/Corpse.h
@ -7,10 +7,10 @@
 #ifndef AZEROTHCORE_CORPSE_H
 #define AZEROTHCORE_CORPSE_H

-#include "Object.h"
 #include "DatabaseEnv.h"
 #include "GridDefines.h"
 #include "LootMgr.h"
+#include "Object.h"

 enum CorpseType
 {
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@ -7,15 +7,14 @@
 #include "BattlegroundMgr.h"
 #include "CellImpl.h"
 #include "Common.h"
+#include "Creature.h"
 #include "CreatureAI.h"
 #include "CreatureAISelector.h"
 #include "CreatureGroups.h"
-#include "Creature.h"
 #include "DatabaseEnv.h"
 #include "Formulas.h"
 #include "GameEventMgr.h"
 #include "GossipDef.h"
-#include "ScriptedGossip.h"
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
 #include "Group.h"
@ -32,17 +31,17 @@
 #include "Player.h"
 #include "PoolMgr.h"
 #include "QuestDef.h"
+#include "ScriptedGossip.h"
 #include "SpellAuraEffects.h"
 #include "SpellMgr.h"
 #include "TemporarySummon.h"
+#include "Transport.h"
 #include "Util.h"
 #include "Vehicle.h"
 #include "WaypointMovementGenerator.h"
 #include "World.h"
 #include "WorldPacket.h"

-#include "Transport.h"
-
 #ifdef ELUNA
 #include "LuaEngine.h"
 #endif
--- a/src/server/game/Entities/Creature/Creature.h
+++ b/src/server/game/Entities/Creature/Creature.h
@ -7,14 +7,13 @@
 #ifndef AZEROTHCORE_CREATURE_H
 #define AZEROTHCORE_CREATURE_H

+#include "Cell.h"
 #include "Common.h"
-#include "Unit.h"
-#include "UpdateMask.h"
+#include "DatabaseEnv.h"
 #include "ItemTemplate.h"
 #include "LootMgr.h"
-#include "DatabaseEnv.h"
-#include "Cell.h"
-
+#include "Unit.h"
+#include "UpdateMask.h"
 #include <list>

 class SpellInfo;
--- a/src/server/game/Entities/Creature/CreatureGroups.cpp
+++ b/src/server/game/Entities/Creature/CreatureGroups.cpp
@ -5,11 +5,10 @@
 */

 #include "Creature.h"
-#include "CreatureGroups.h"
-#include "ObjectMgr.h"
-
 #include "CreatureAI.h"
+#include "CreatureGroups.h"
 #include "MoveSplineInit.h"
+#include "ObjectMgr.h"

 FormationMgr::~FormationMgr()
 {
--- a/src/server/game/Entities/Creature/CreatureGroups.h
+++ b/src/server/game/Entities/Creature/CreatureGroups.h
@ -8,8 +8,9 @@
 #define _FORMATIONS_H

 #include "Define.h"
-#include <unordered_map>
+#include "Unit.h"
 #include <map>
+#include <unordered_map>

 class Creature;
 class CreatureGroup;
--- a/src/server/game/Entities/Creature/GossipDef.cpp
+++ b/src/server/game/Entities/Creature/GossipDef.cpp
@ -4,13 +4,13 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "QuestDef.h"
+#include "Formulas.h"
 #include "GossipDef.h"
 #include "ObjectMgr.h"
 #include "Opcodes.h"
+#include "QuestDef.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "Formulas.h"

 GossipMenu::GossipMenu()
 {
--- a/src/server/game/Entities/Creature/GossipDef.h
+++ b/src/server/game/Entities/Creature/GossipDef.h
@ -8,8 +8,8 @@
 #define AZEROTHCORE_GOSSIP_H

 #include "Common.h"
-#include "QuestDef.h"
 #include "NPCHandler.h"
+#include "QuestDef.h"

 class WorldSession;

--- a/src/server/game/Entities/Creature/TemporarySummon.cpp
+++ b/src/server/game/Entities/Creature/TemporarySummon.cpp
@ -4,14 +4,14 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

+#include "CreatureAI.h"
 #include "Log.h"
 #include "ObjectAccessor.h"
-#include "CreatureAI.h"
 #include "ObjectMgr.h"
-#include "TemporarySummon.h"
 #include "Pet.h"
 #include "Player.h"
 #include "ScriptMgr.h"
+#include "TemporarySummon.h"

 TempSummon::TempSummon(SummonPropertiesEntry const* properties, uint64 owner, bool isWorldObject) :
    Creature(isWorldObject), m_Properties(properties), m_type(TEMPSUMMON_MANUAL_DESPAWN),
--- a/src/server/game/Entities/DynamicObject/DynamicObject.cpp
+++ b/src/server/game/Entities/DynamicObject/DynamicObject.cpp
@ -4,17 +4,17 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

+#include "CellImpl.h"
 #include "Common.h"
-#include "UpdateMask.h"
-#include "Opcodes.h"
-#include "World.h"
-#include "ObjectAccessor.h"
 #include "DatabaseEnv.h"
 #include "GridNotifiers.h"
-#include "CellImpl.h"
 #include "GridNotifiersImpl.h"
+#include "ObjectAccessor.h"
+#include "Opcodes.h"
 #include "ScriptMgr.h"
 #include "Transport.h"
+#include "UpdateMask.h"
+#include "World.h"

 DynamicObject::DynamicObject(bool isWorldObject) : WorldObject(isWorldObject), MovableMapObject(),
    _aura(nullptr), _removedAura(nullptr), _caster(nullptr), _duration(0), _isViewpoint(false)
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@ -4,13 +4,13 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include <G3D/Quat.h>
-#include "GameObjectAI.h"
+#include "AccountMgr.h"
 #include "BattlegroundAV.h"
 #include "CellImpl.h"
 #include "CreatureAISelector.h"
 #include "DisableMgr.h"
 #include "DynamicTree.h"
+#include "GameObjectAI.h"
 #include "GameObjectModel.h"
 #include "GridNotifiersImpl.h"
 #include "Group.h"
@ -20,10 +20,11 @@
 #include "PoolMgr.h"
 #include "ScriptMgr.h"
 #include "SpellMgr.h"
+#include "Transport.h"
 #include "UpdateFieldFlags.h"
 #include "World.h"
-#include "Transport.h"
-#include "AccountMgr.h"
+#include <G3D/Quat.h>
+
 #ifdef ELUNA
 #include "LuaEngine.h"
 #endif
--- a/src/server/game/Entities/GameObject/GameObject.h
+++ b/src/server/game/Entities/GameObject/GameObject.h
@ -8,12 +8,12 @@
 #define AZEROTHCORE_GAMEOBJECT_H

 #include "Common.h"
-#include "SharedDefines.h"
-#include "Unit.h"
-#include "Object.h"
-#include "LootMgr.h"
 #include "DatabaseEnv.h"
 #include "G3D/Quat.h"
+#include "LootMgr.h"
+#include "Object.h"
+#include "SharedDefines.h"
+#include "Unit.h"

 class GameObjectAI;
 class Transport;
--- a/src/server/game/Entities/Item/Container/Bag.cpp
+++ b/src/server/game/Entities/Item/Container/Bag.cpp
@ -4,14 +4,13 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "Common.h"
-#include "ObjectMgr.h"
-#include "DatabaseEnv.h"
-
 #include "Bag.h"
+#include "Common.h"
+#include "DatabaseEnv.h"
 #include "Log.h"
-#include "UpdateData.h"
+#include "ObjectMgr.h"
 #include "Player.h"
+#include "UpdateData.h"

 Bag::Bag(): Item()
 {
--- a/src/server/game/Entities/Item/Item.cpp
+++ b/src/server/game/Entities/Item/Item.cpp
@ -5,16 +5,16 @@
 */

 #include "Common.h"
-#include "Item.h"
-#include "ObjectMgr.h"
-#include "WorldPacket.h"
-#include "DatabaseEnv.h"
-#include "ItemEnchantmentMgr.h"
-#include "SpellMgr.h"
-#include "SpellInfo.h"
-#include "ScriptMgr.h"
 #include "ConditionMgr.h"
+#include "DatabaseEnv.h"
+#include "Item.h"
+#include "ItemEnchantmentMgr.h"
+#include "ObjectMgr.h"
 #include "Player.h"
+#include "ScriptMgr.h"
+#include "SpellInfo.h"
+#include "SpellMgr.h"
+#include "WorldPacket.h"
 #include "WorldSession.h"

 void AddItemsSetItem(Player* player, Item* item)
--- a/src/server/game/Entities/Item/Item.h
+++ b/src/server/game/Entities/Item/Item.h
@ -8,10 +8,10 @@
 #define AZEROTHCORE_ITEM_H

 #include "Common.h"
-#include "Object.h"
-#include "LootMgr.h"
-#include "ItemTemplate.h"
 #include "DatabaseEnv.h"
+#include "ItemTemplate.h"
+#include "LootMgr.h"
+#include "Object.h"

 class SpellInfo;
 class Bag;
--- a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
+++ b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
@ -4,16 +4,16 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include <stdlib.h>
-#include <functional>
-#include "ItemEnchantmentMgr.h"
 #include "DatabaseEnv.h"
+#include "DBCStores.h"
+#include "ItemEnchantmentMgr.h"
 #include "Log.h"
 #include "ObjectMgr.h"
-#include <list>
-#include <vector>
 #include "Util.h"
-#include "DBCStores.h"
+#include <functional>
+#include <list>
+#include <stdlib.h>
+#include <vector>

 struct EnchStoreItem
 {
--- a/src/server/game/Entities/Object/Object.cpp
+++ b/src/server/game/Entities/Object/Object.cpp
@ -4,48 +4,48 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "Common.h"
-#include "Physics.h"
-#include "SharedDefines.h"
-#include "WorldPacket.h"
-#include "Opcodes.h"
-#include "Log.h"
-#include "World.h"
-#include "Object.h"
-#include "Creature.h"
-#include "Player.h"
-#include "Vehicle.h"
-#include "ObjectMgr.h"
-#include "UpdateData.h"
-#include "UpdateMask.h"
-#include "Util.h"
-#include "MapManager.h"
-#include "ObjectAccessor.h"
-#include "Log.h"
-#include "Transport.h"
-#include "TargetedMovementGenerator.h"
-#include "WaypointMovementGenerator.h"
-#include "VMapFactory.h"
-#include "CellImpl.h"
-#include "GridNotifiers.h"
-#include "GridNotifiersImpl.h"
-#include "SpellAuraEffects.h"
 #include "Battlefield.h"
 #include "BattlefieldMgr.h"
-#include "UpdateFieldFlags.h"
+#include "CellImpl.h"
+#include "Chat.h"
+#include "Common.h"
+#include "Creature.h"
+#include "DynamicTree.h"
+#include "DynamicVisibility.h"
+#include "GridNotifiers.h"
+#include "GridNotifiersImpl.h"
+#include "Group.h"
+#include "Log.h"
+#include "Log.h"
+#include "MapManager.h"
+#include "MovementPacketBuilder.h"
+#include "Object.h"
+#include "ObjectAccessor.h"
+#include "ObjectMgr.h"
+#include "Opcodes.h"
+#include "OutdoorPvPMgr.h"
+#include "Physics.h"
+#include "Player.h"
+#include "ScriptMgr.h"
+#include "SharedDefines.h"
+#include "SpellAuraEffects.h"
+#include "TargetedMovementGenerator.h"
 #include "TemporarySummon.h"
 #include "Totem.h"
-#include "OutdoorPvPMgr.h"
-#include "MovementPacketBuilder.h"
-#include "DynamicTree.h"
-#include "Group.h"
-#include "Chat.h"
-#include "DynamicVisibility.h"
-#include "ScriptMgr.h"
+#include "Transport.h"
+#include "UpdateData.h"
+#include "UpdateFieldFlags.h"
+#include "UpdateMask.h"
+#include "Util.h"
+#include "Vehicle.h"
+#include "VMapFactory.h"
+#include "WaypointMovementGenerator.h"
+#include "World.h"
+#include "WorldPacket.h"

 #ifdef ELUNA
-#include "LuaEngine.h"
 #include "ElunaEventMgr.h"
+#include "LuaEngine.h"
 #endif

 uint32 GuidHigh2TypeId(uint32 guid_hi)
--- a/src/server/game/Entities/Object/Object.h
+++ b/src/server/game/Entities/Object/Object.h
@ -9,21 +9,20 @@

 #include "Common.h"
 #include "DataMap.h"
-#include "UpdateMask.h"
-#include "UpdateData.h"
-#include "GridReference.h"
-#include "ObjectDefines.h"
 #include "GridDefines.h"
+#include "GridReference.h"
 #include "Map.h"
+#include "ObjectDefines.h"
+#include "UpdateData.h"
+#include "UpdateMask.h"
+#include <set>
+#include <string>
+#include <sstream>

 #ifdef ELUNA
 class ElunaEventProcessor;
 #endif

-#include <set>
-#include <string>
-#include <sstream>
-
 enum TypeMask
 {
    TYPEMASK_OBJECT         = 0x0001,
--- a/src/server/game/Entities/Object/Updates/UpdateData.cpp
+++ b/src/server/game/Entities/Object/Updates/UpdateData.cpp
@ -4,13 +4,13 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "Common.h"
 #include "ByteBuffer.h"
-#include "WorldPacket.h"
-#include "UpdateData.h"
+#include "Common.h"
 #include "Log.h"
 #include "Opcodes.h"
+#include "UpdateData.h"
 #include "World.h"
+#include "WorldPacket.h"
 #include "zlib.h"

 UpdateData::UpdateData() : m_blockCount(0)
--- a/src/server/game/Entities/Object/Updates/UpdateData.h
+++ b/src/server/game/Entities/Object/Updates/UpdateData.h
@ -8,6 +8,7 @@
 #define __UPDATEDATA_H

 #include "ByteBuffer.h"
+
 class WorldPacket;

 enum OBJECT_UPDATE_TYPE
--- a/src/server/game/Entities/Object/Updates/UpdateFieldFlags.h
+++ b/src/server/game/Entities/Object/Updates/UpdateFieldFlags.h
@ -7,8 +7,8 @@
 #ifndef _UPDATEFIELDFLAGS_H
 #define _UPDATEFIELDFLAGS_H

-#include "UpdateFields.h"
 #include "Define.h"
+#include "UpdateFields.h"

 enum UpdatefieldFlags
 {
--- a/src/server/game/Entities/Object/Updates/UpdateMask.h
+++ b/src/server/game/Entities/Object/Updates/UpdateMask.h
@ -7,9 +7,9 @@
 #ifndef __UPDATEMASK_H
 #define __UPDATEMASK_H

-#include "UpdateFields.h"
-#include "Errors.h"
 #include "ByteBuffer.h"
+#include "Errors.h"
+#include "UpdateFields.h"

 class UpdateMask
 {
--- a/src/server/game/Entities/Pet/Pet.cpp
+++ b/src/server/game/Entities/Pet/Pet.cpp
@ -4,24 +4,24 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

+#include "ArenaSpectator.h"
+#include "Battleground.h"
 #include "Common.h"
-#include "DatabaseEnv.h"
-#include "Log.h"
-#include "WorldPacket.h"
-#include "ObjectMgr.h"
-#include "SpellMgr.h"
-#include "Pet.h"
-#include "Formulas.h"
-#include "SpellAuras.h"
-#include "SpellAuraEffects.h"
 #include "CreatureAI.h"
+#include "DatabaseEnv.h"
+#include "Formulas.h"
+#include "Group.h"
+#include "InstanceScript.h"
+#include "Log.h"
+#include "ObjectMgr.h"
+#include "Pet.h"
+#include "SpellAuraEffects.h"
+#include "SpellAuras.h"
+#include "SpellMgr.h"
 #include "Unit.h"
 #include "Util.h"
-#include "Group.h"
+#include "WorldPacket.h"
 #include "WorldSession.h"
-#include "Battleground.h"
-#include "InstanceScript.h"
-#include "ArenaSpectator.h"

 Pet::Pet(Player* owner, PetType type) : Guardian(nullptr, owner ? owner->GetGUID() : 0, true),
    m_usedTalentCount(0), m_removed(false), m_owner(owner),
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@ -4,9 +4,9 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "Player.h"
 #include "AccountMgr.h"
 #include "AchievementMgr.h"
+#include "ArenaSpectator.h"
 #include "ArenaTeam.h"
 #include "ArenaTeamMgr.h"
 #include "Battlefield.h"
@ -27,6 +27,9 @@
 #include "DisableMgr.h"
 #include "Formulas.h"
 #include "GameEventMgr.h"
+#include "GameGraveyard.h"
+#include "GameObjectAI.h"
+#include "GitRevision.h"
 #include "GossipDef.h"
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
@ -34,8 +37,6 @@
 #include "GroupMgr.h"
 #include "Guild.h"
 #include "GuildMgr.h"
-#include "GitRevision.h"
-#include "revision.h"
 #include "InstanceSaveMgr.h"
 #include "InstanceScript.h"
 #include "Language.h"
@ -51,14 +52,20 @@
 #include "OutdoorPvPMgr.h"
 #include "Pet.h"
 #include "PetitionMgr.h"
+#include "Player.h"
+#include "PoolMgr.h"
 #include "QuestDef.h"
 #include "ReputationMgr.h"
+#include "revision.h"
+#include "SavingSystem.h"
+#include "ScriptMgr.h"
 #include "SkillDiscovery.h"
 #include "SocialMgr.h"
 #include "Spell.h"
 #include "SpellAuraEffects.h"
 #include "SpellAuras.h"
 #include "SpellMgr.h"
+#include "TicketMgr.h"
 #include "Transport.h"
 #include "UpdateData.h"
 #include "UpdateFieldFlags.h"
@ -70,13 +77,6 @@
 #include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "ArenaSpectator.h"
-#include "GameObjectAI.h"
-#include "PoolMgr.h"
-#include "SavingSystem.h"
-#include "TicketMgr.h"
-#include "ScriptMgr.h"
-#include "GameGraveyard.h"

 #ifdef ELUNA
 #include "LuaEngine.h"
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@ -7,20 +7,19 @@
 #ifndef _PLAYER_H
 #define _PLAYER_H

+
+#include "Battleground.h"
 #include "DBCStores.h"
 #include "GroupReference.h"
-#include "MapReference.h"
 #include "InstanceSaveMgr.h"
-
 #include "Item.h"
+#include "MapReference.h"
+#include "ObjectMgr.h"
 #include "PetDefines.h"
 #include "QuestDef.h"
 #include "SpellMgr.h"
 #include "Unit.h"
-#include "Battleground.h"
 #include "WorldSession.h"
-#include "ObjectMgr.h"
-
 #include <string>
 #include <vector>

--- a/src/server/game/Entities/Player/SocialMgr.cpp
+++ b/src/server/game/Entities/Player/SocialMgr.cpp
@ -4,15 +4,14 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "SocialMgr.h"
-
-#include "DatabaseEnv.h"
-#include "WorldSession.h"
-#include "WorldPacket.h"
-#include "Player.h"
-#include "ObjectMgr.h"
-#include "Util.h"
 #include "AccountMgr.h"
+#include "DatabaseEnv.h"
+#include "ObjectMgr.h"
+#include "Player.h"
+#include "SocialMgr.h"
+#include "Util.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"

 PlayerSocial::PlayerSocial(): m_playerGUID() { }

--- a/Show more
+++ b/Show more