refactor(src/server/game): optimise imports (#20541)

2026-01-25 22:56:24 +00:00 · 2024-11-13 11:37:20 +01:00
parent b2ddd10369
commit a9f0f371e5
45 changed files with 44 additions and 35 deletions
--- a/src/server/apps/worldserver/RemoteAccess/RASession.cpp
+++ b/src/server/apps/worldserver/RemoteAccess/RASession.cpp
@@ -22,6 +22,7 @@
 #include "Duration.h"
 #include "Log.h"
 #include "MotdMgr.h"
+#include "QueryResult.h"
 #include "SRP6.h"
 #include "Util.h"
 #include "World.h"
--- a/src/server/game/AI/SmartScripts/SmartScript.h
+++ b/src/server/game/AI/SmartScripts/SmartScript.h
@@ -18,9 +18,7 @@
 #ifndef ACORE_SMARTSCRIPT_H
 #define ACORE_SMARTSCRIPT_H

-#include "Common.h"
 #include "Creature.h"
-#include "CreatureAI.h"
 #include "GridNotifiers.h"
 #include "SmartScriptMgr.h"
 #include "Spell.h"
--- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h
+++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h
@@ -20,12 +20,11 @@

 #include "Common.h"
 #include "Creature.h"
-#include "CreatureAI.h"
 #include "DBCStores.h"
+#include "ObjectAccessor.h"
+#include "ObjectMgr.h"
 #include "Optional.h"
-#include "Spell.h"
 #include "SpellMgr.h"
-#include "Unit.h"
 #include <limits>

 typedef uint32 SAIBool;
--- a/src/server/game/Battlefield/Zones/BattlefieldWG.h
+++ b/src/server/game/Battlefield/Zones/BattlefieldWG.h
@@ -20,7 +20,6 @@

 #include "Battlefield.h"
 #include "Log.h"
-#include "ObjectAccessor.h"
 #include "World.h"

 class Group;
--- a/src/server/game/Battlegrounds/BattlegroundQueue.h
+++ b/src/server/game/Battlegrounds/BattlegroundQueue.h
@@ -19,9 +19,10 @@
 #define __BATTLEGROUNDQUEUE_H

 #include "Battleground.h"
-#include "Common.h"
 #include "DBCEnums.h"
 #include "EventProcessor.h"
+#include "ObjectGuid.h"
+#include "SharedDefines.h"
 #include <array>

 constexpr auto COUNT_OF_PLAYERS_TO_AVERAGE_WAIT_TIME = 10;
--- a/src/server/game/Chat/Channels/Channel.h
+++ b/src/server/game/Chat/Channels/Channel.h
@@ -18,7 +18,6 @@
 #ifndef _CHANNEL_H
 #define _CHANNEL_H

-#include "Common.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include <string>
--- a/src/server/game/Chat/Hyperlinks.cpp
+++ b/src/server/game/Chat/Hyperlinks.cpp
@@ -23,6 +23,7 @@
 #include "SharedDefines.h"
 #include "SpellInfo.h"
 #include "SpellMgr.h"
+#include "World.h"

 using namespace Acore::Hyperlinks;

--- a/src/server/game/DungeonFinding/LFGQueue.h
+++ b/src/server/game/DungeonFinding/LFGQueue.h
@@ -18,8 +18,6 @@
 #ifndef _LFGQUEUE_H
 #define _LFGQUEUE_H

-#include <utility>
-
 #include "LFG.h"

 namespace lfg
--- a/src/server/game/Entities/Creature/Creature.h
+++ b/src/server/game/Entities/Creature/Creature.h
@@ -22,10 +22,8 @@
 #include "CharmInfo.h"
 #include "Common.h"
 #include "CreatureData.h"
-#include "DatabaseEnv.h"
 #include "LootMgr.h"
 #include "Unit.h"
-#include "World.h"
 #include <list>

 class SpellInfo;
--- a/src/server/game/Entities/Creature/CreatureGroups.cpp
+++ b/src/server/game/Entities/Creature/CreatureGroups.cpp
@@ -21,6 +21,7 @@
 #include "Log.h"
 #include "MoveSplineInit.h"
 #include "ObjectMgr.h"
+#include "QueryResult.h"
 #include "WaypointMgr.h"

 FormationMgr::~FormationMgr()
--- a/src/server/game/Entities/Creature/CreatureGroups.h
+++ b/src/server/game/Entities/Creature/CreatureGroups.h
@@ -19,6 +19,7 @@
 #define _FORMATIONS_H

 #include "Define.h"
+#include "ObjectGuid.h"
 #include "Unit.h"
 #include <map>
 #include <unordered_map>
--- a/src/server/game/Entities/Creature/GossipDef.h
+++ b/src/server/game/Entities/Creature/GossipDef.h
@@ -20,8 +20,9 @@

 #include "Common.h"
 #include "NPCHandler.h"
-#include "Object.h"
+#include "ObjectGuid.h"
 #include "QuestDef.h"
+#include <map>

 class WorldSession;
 class ObjectGuid;
--- a/src/server/game/Entities/GameObject/GameObject.h
+++ b/src/server/game/Entities/GameObject/GameObject.h
@@ -19,7 +19,6 @@
 #define AZEROTHCORE_GAMEOBJECT_H

 #include "Common.h"
-#include "DatabaseEnv.h"
 #include "G3D/Quat.h"
 #include "GameObjectData.h"
 #include "LootMgr.h"
--- a/src/server/game/Entities/GameObject/GameObjectData.h
+++ b/src/server/game/Entities/GameObject/GameObjectData.h
@@ -19,9 +19,9 @@
 #define GAMEOBJECTDATA_H

 #include "SharedDefines.h"
-#include "WorldPacket.h"
-#include <string>
+#include <array>
 #include <vector>
+#include <string>

 #define MAX_GAMEOBJECT_QUEST_ITEMS 6
 #define MAX_GO_STATE               3
--- a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
+++ b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
@@ -20,6 +20,7 @@
 #include "DatabaseEnv.h"
 #include "Log.h"
 #include "ObjectMgr.h"
+#include "QueryResult.h"
 #include "Util.h"
 #include <cmath>
 #include <functional>
--- a/src/server/game/Entities/Object/Position.cpp
+++ b/src/server/game/Entities/Object/Position.cpp
@@ -19,6 +19,7 @@
 #include "ByteBuffer.h"
 #include "Geometry.h"
 #include "GridDefines.h"
+#include "Random.h"
 #include <G3D/g3dmath.h>
 #include <sstream>

--- a/src/server/game/Entities/Player/CinematicMgr.h
+++ b/src/server/game/Entities/Player/CinematicMgr.h
@@ -19,7 +19,9 @@
 #define CinematicMgr_h__

 #include "Define.h"
-#include "Object.h"
+#include "Position.h"
+#include "TemporarySummon.h"
+#include <vector>

 constexpr auto CINEMATIC_UPDATEDIFF = 500;
 constexpr auto CINEMATIC_LOOKAHEAD  = 2000;
--- a/src/server/game/Entities/Unit/CharmInfo.h
+++ b/src/server/game/Entities/Unit/CharmInfo.h
@@ -18,7 +18,8 @@
 #ifndef _CHARMINFO_H
 #define _CHARMINFO_H

-#include "Object.h"
+#include "Define.h"
+#include "ObjectGuid.h"

 #define MAX_SPELL_CHARM         4
 #define MAX_SPELL_VEHICLE       6
--- a/src/server/game/Grids/NGrid.h
+++ b/src/server/game/Grids/NGrid.h
@@ -24,7 +24,6 @@
 #include "Grid.h"
 #include "GridReference.h"
 #include "Timer.h"
-#include "Util.h"

 template
 <
--- a/src/server/game/Guilds/Guild.h
+++ b/src/server/game/Guilds/Guild.h
@@ -22,7 +22,6 @@
 #include "ObjectMgr.h"
 #include "Optional.h"
 #include "Player.h"
-#include "WorldPacket.h"
 #include <set>
 #include <unordered_map>

--- a/src/server/game/Loot/LootItemStorage.cpp
+++ b/src/server/game/Loot/LootItemStorage.cpp
@@ -19,6 +19,7 @@
 #include "DatabaseEnv.h"
 #include "ObjectMgr.h"
 #include "PreparedStatement.h"
+#include "QueryResult.h"

 LootItemStorage::LootItemStorage()
 {
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -31,6 +31,7 @@
 #include "MapInstanced.h"
 #include "Metric.h"
 #include "MiscPackets.h"
+#include "MMapFactory.h"
 #include "Object.h"
 #include "ObjectAccessor.h"
 #include "ObjectGridLoader.h"
--- a/src/server/game/Maps/TransportMgr.cpp
+++ b/src/server/game/Maps/TransportMgr.cpp
@@ -19,6 +19,7 @@
 #include "InstanceScript.h"
 #include "MapMgr.h"
 #include "MoveSpline.h"
+#include "QueryResult.h"
 #include "Transport.h"

 TransportTemplate::~TransportTemplate()
--- a/src/server/game/Misc/DynamicVisibility.h
+++ b/src/server/game/Misc/DynamicVisibility.h
@@ -18,7 +18,7 @@
 #ifndef __DYNAMICVISIBILITY_H
 #define __DYNAMICVISIBILITY_H

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

 struct VisibilitySettingData
 {
--- a/src/server/game/Movement/MotionMaster.h
+++ b/src/server/game/Movement/MotionMaster.h
@@ -19,7 +19,9 @@
 #define ACORE_MOTIONMASTER_H

 #include "Common.h"
-#include "Object.h"
+#include "ObjectGuid.h"
+#include "PathGenerator.h"
+#include "Position.h"
 #include "SharedDefines.h"
 #include "Spline/MoveSpline.h"
 #include <optional>
--- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
@@ -18,7 +18,9 @@
 #ifndef ACORE_FLEEINGMOVEMENTGENERATOR_H
 #define ACORE_FLEEINGMOVEMENTGENERATOR_H

+#include "Creature.h"
 #include "MovementGenerator.h"
+#include "Timer.h"

 template<class T>
 class FleeingMovementGenerator : public MovementGeneratorMedium< T, FleeingMovementGenerator<T> >
--- a/src/server/game/Movement/MovementGenerators/PathGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/PathGenerator.h
@@ -20,7 +20,6 @@

 #include "DetourNavMesh.h"
 #include "DetourNavMeshQuery.h"
-#include "MMapFactory.h"
 #include "MMapMgr.h"
 #include "MapDefines.h"
 #include "MoveSplineInitArgs.h"
--- a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
@@ -18,7 +18,7 @@
 #ifndef ACORE_POINTMOVEMENTGENERATOR_H
 #define ACORE_POINTMOVEMENTGENERATOR_H

-#include "FollowerReference.h"
+#include "Creature.h"
 #include "MovementGenerator.h"

 template<class T>
--- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
@@ -25,6 +25,7 @@
 #include "ObjectAccessor.h"
 #include "Spell.h"
 #include "Util.h"
+#include "World.h"

 template<class T>
 RandomMovementGenerator<T>::~RandomMovementGenerator() { }
--- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
@@ -20,6 +20,7 @@

 #include "MovementGenerator.h"
 #include "PathGenerator.h"
+#include "Timer.h"

 #define RANDOM_POINTS_NUMBER        12
 #define RANDOM_LINKS_COUNT          7
--- a/src/server/game/Movement/Waypoints/WaypointMgr.h
+++ b/src/server/game/Movement/Waypoints/WaypointMgr.h
@@ -18,7 +18,7 @@
 #ifndef ACORE_WAYPOINTMANAGER_H
 #define ACORE_WAYPOINTMANAGER_H

-#include "Common.h"
+#include "Define.h"
 #include <optional>
 #include <unordered_map>
 #include <vector>
--- a/src/server/game/Pools/PoolMgr.cpp
+++ b/src/server/game/Pools/PoolMgr.cpp
@@ -20,6 +20,7 @@
 #include "Log.h"
 #include "MapMgr.h"
 #include "ObjectMgr.h"
+#include "QueryResult.h"
 #include "Transport.h"

 ////////////////////////////////////////////////////////////
--- a/src/server/game/Reputation/ReputationMgr.h
+++ b/src/server/game/Reputation/ReputationMgr.h
@@ -18,10 +18,9 @@
 #ifndef __ACORE_REPUTATION_MGR_H
 #define __ACORE_REPUTATION_MGR_H

-#include "Common.h"
+#include "DatabaseEnvFwd.h"
 #include "DBCStructure.h"
 #include "Language.h"
-#include "QueryResult.h"
 #include "SharedDefines.h"
 #include <map>

--- a/src/server/game/Scripting/MapScripts.cpp
+++ b/src/server/game/Scripting/MapScripts.cpp
@@ -20,14 +20,12 @@
 #include "GridNotifiers.h"
 #include "Map.h"
 #include "MapMgr.h"
-#include "MapRefMgr.h"
 #include "ObjectMgr.h"
 #include "Pet.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 #include "Transport.h"
 #include "WaypointMgr.h"
-#include "World.h"

 /// Put scripts in the execution queue
 void Map::ScriptsStart(ScriptMapMap const& scripts, uint32 id, Object* source, Object* target)
--- a/src/server/game/Scripting/ScriptDefines/GlobalScript.h
+++ b/src/server/game/Scripting/ScriptDefines/GlobalScript.h
@@ -18,6 +18,7 @@
 #ifndef SCRIPT_OBJECT_GLOBAL_SCRIPT_H_
 #define SCRIPT_OBJECT_GLOBAL_SCRIPT_H_

+#include "DatabaseEnvFwd.h"
 #include "DBCEnums.h"
 #include "ObjectGuid.h"
 #include "ScriptObject.h"
--- a/src/server/game/Scripting/ScriptDefines/ServerScript.h
+++ b/src/server/game/Scripting/ScriptDefines/ServerScript.h
@@ -20,6 +20,7 @@

 #include "ScriptObject.h"
 #include <vector>
+#include <memory> // NOTE: this import is NEEDED (even though some IDEs report it as unused)

 enum ServerHook
 {
--- a/src/server/game/Scripting/ScriptObject.h
+++ b/src/server/game/Scripting/ScriptObject.h
@@ -18,8 +18,8 @@
 #ifndef _SCRIPT_OBJECT_H_
 #define _SCRIPT_OBJECT_H_

-#include "DatabaseEnvFwd.h"
 #include "ScriptObjectFwd.h"
+#include <string>

 //#include "Duration.h"
 //#include "LFG.h"
--- a/src/server/game/Spells/Spell.h
+++ b/src/server/game/Spells/Spell.h
@@ -18,11 +18,13 @@
 #ifndef __SPELL_H
 #define __SPELL_H

+#include "ConditionMgr.h"
 #include "GridDefines.h"
-#include "ObjectMgr.h"
+#include "LootMgr.h"
 #include "PathGenerator.h"
 #include "SharedDefines.h"
 #include "SpellInfo.h"
+#include "Unit.h"

 class Unit;
 class Player;
--- a/src/server/game/Time/UpdateTime.h
+++ b/src/server/game/Time/UpdateTime.h
@@ -21,7 +21,6 @@
 #include "Define.h"
 #include "Duration.h"
 #include <array>
-#include <string>

 constexpr auto AVG_DIFF_COUNT = 500;

--- a/src/server/game/Tools/CharacterDatabaseCleaner.cpp
+++ b/src/server/game/Tools/CharacterDatabaseCleaner.cpp
@@ -19,6 +19,7 @@
 #include "DBCStores.h"
 #include "Database/DatabaseEnv.h"
 #include "Log.h"
+#include "QueryResult.h"
 #include "SpellMgr.h"
 #include "World.h"

--- a/src/server/game/Tools/PlayerDump.h
+++ b/src/server/game/Tools/PlayerDump.h
@@ -19,7 +19,6 @@
 #define _PLAYER_DUMP_H

 #include "ObjectGuid.h"
-#include <map>
 #include <set>

 enum DumpTableType
--- a/src/server/game/Warden/WardenCheckMgr.cpp
+++ b/src/server/game/Warden/WardenCheckMgr.cpp
@@ -18,6 +18,7 @@
 #include "WardenCheckMgr.h"
 #include "Database/DatabaseEnv.h"
 #include "Log.h"
+#include "QueryResult.h"
 #include "Util.h"
 #include "Warden.h"
 #include "WorldSession.h"
--- a/src/server/game/Weather/WeatherMgr.cpp
+++ b/src/server/game/Weather/WeatherMgr.cpp
@@ -26,7 +26,6 @@
 #include "Player.h"
 #include "Weather.h"
 #include "WorldSession.h"
-#include <memory>

 namespace WeatherMgr
 {
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -22,10 +22,10 @@
 #ifndef __WORLD_H
 #define __WORLD_H

+#include "DatabaseEnvFwd.h"
 #include "IWorld.h"
 #include "LockedQueue.h"
 #include "ObjectGuid.h"
-#include "QueryResult.h"
 #include "SharedDefines.h"
 #include "Timer.h"
 #include <atomic>
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -34,6 +34,7 @@
 #include "Language.h"
 #include "MapMgr.h"
 #include "MiscPackets.h"
+#include "MMapFactory.h"
 #include "MovementGenerator.h"
 #include "ObjectAccessor.h"
 #include "Pet.h"