From 23e9b85d0e01298feac4f5e1951bc1d15a333d8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Borz=C3=AC?= Date: Sat, 19 Jun 2021 01:25:29 +0200 Subject: [PATCH] refactor(Core): code cleanup (part 3) (#6380) --- .../database/Database/DatabaseLoader.cpp | 1 - .../database/Database/DatabaseWorker.cpp | 1 - src/server/game/Petitions/PetitionMgr.cpp | 4 ++-- src/server/game/Petitions/PetitionMgr.h | 4 ++-- src/server/game/PrecompiledHeaders/gamePCH.h | 4 ++++ src/server/game/Scripting/MapScripts.cpp | 1 - src/server/game/Scripting/ScriptMgr.h | 4 ++-- .../game/Server/Packets/PacketUtilities.cpp | 1 - src/server/game/Server/Protocol/Opcodes.cpp | 2 +- src/server/game/Server/WorldSession.cpp | 2 +- src/server/game/Server/WorldSocket.cpp | 1 - src/server/game/Server/WorldSocketMgr.cpp | 2 -- .../game/Spells/Auras/SpellAuraEffects.cpp | 24 +++++++++++-------- src/server/game/Spells/Auras/SpellAuras.cpp | 2 +- src/server/game/Spells/Auras/SpellAuras.h | 1 - src/server/game/Spells/SpellEffects.cpp | 8 ------- src/server/game/Spells/SpellInfo.cpp | 2 +- src/server/game/Tools/PlayerDump.cpp | 1 - src/server/game/Warden/Warden.cpp | 3 +-- src/server/game/Warden/WardenCheckMgr.cpp | 8 +++---- src/server/game/Warden/WardenMac.cpp | 3 --- src/server/game/Warden/WardenWin.cpp | 3 --- src/server/game/Weather/Weather.cpp | 3 --- src/server/game/World/World.cpp | 2 -- .../shared/DataStores/DBCDatabaseLoader.cpp | 3 --- src/server/shared/Network/RealmSocket.cpp | 1 - src/server/shared/Packets/ByteBuffer.cpp | 1 - src/server/shared/Packets/ByteBuffer.h | 2 +- src/server/shared/Secrets/SecretMgr.cpp | 3 +-- src/server/worldserver/Main.cpp | 1 - src/server/worldserver/Master.cpp | 1 - 31 files changed, 34 insertions(+), 65 deletions(-) diff --git a/src/server/database/Database/DatabaseLoader.cpp b/src/server/database/Database/DatabaseLoader.cpp index b47b5488ae..3ea9456eb5 100644 --- a/src/server/database/Database/DatabaseLoader.cpp +++ b/src/server/database/Database/DatabaseLoader.cpp @@ -8,7 +8,6 @@ #include "DatabaseEnv.h" #include "Log.h" #include "Duration.h" -#include #include #include diff --git a/src/server/database/Database/DatabaseWorker.cpp b/src/server/database/Database/DatabaseWorker.cpp index f83190ba93..3998722024 100644 --- a/src/server/database/Database/DatabaseWorker.cpp +++ b/src/server/database/Database/DatabaseWorker.cpp @@ -4,7 +4,6 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "DatabaseEnv.h" #include "DatabaseWorker.h" #include "SQLOperation.h" #include "MySQLConnection.h" diff --git a/src/server/game/Petitions/PetitionMgr.cpp b/src/server/game/Petitions/PetitionMgr.cpp index e414f96309..bd94e286eb 100644 --- a/src/server/game/Petitions/PetitionMgr.cpp +++ b/src/server/game/Petitions/PetitionMgr.cpp @@ -1,6 +1,6 @@ /* -Xinef - */ + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 +*/ #include "DatabaseEnv.h" #include "Log.h" diff --git a/src/server/game/Petitions/PetitionMgr.h b/src/server/game/Petitions/PetitionMgr.h index 55183af210..28fbd3f433 100644 --- a/src/server/game/Petitions/PetitionMgr.h +++ b/src/server/game/Petitions/PetitionMgr.h @@ -1,6 +1,6 @@ /* -Xinef - */ + * Originally written by Xinef - Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: http://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 +*/ #ifndef _PETITIONMGR_H #define _PETITIONMGR_H diff --git a/src/server/game/PrecompiledHeaders/gamePCH.h b/src/server/game/PrecompiledHeaders/gamePCH.h index 824069bf56..d3eda38b6c 100644 --- a/src/server/game/PrecompiledHeaders/gamePCH.h +++ b/src/server/game/PrecompiledHeaders/gamePCH.h @@ -1,3 +1,7 @@ +/* + * Copyright (C) 2016+ AzerothCore , released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3 + */ + //add here most rarely modified headers to speed up debug build compilation #include "WorldSocket.h" // must be first to make ACE happy with ACE includes in it diff --git a/src/server/game/Scripting/MapScripts.cpp b/src/server/game/Scripting/MapScripts.cpp index cff17ff53d..944fc427b0 100644 --- a/src/server/game/Scripting/MapScripts.cpp +++ b/src/server/game/Scripting/MapScripts.cpp @@ -5,7 +5,6 @@ */ #include "CellImpl.h" -#include "GossipDef.h" #include "GridNotifiers.h" #include "GridNotifiersImpl.h" #include "Map.h" diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h index 6b8b11490e..2d2307684b 100644 --- a/src/server/game/Scripting/ScriptMgr.h +++ b/src/server/game/Scripting/ScriptMgr.h @@ -1936,10 +1936,10 @@ public: { // Try to find an existing script. bool existing = false; - for (ScriptMapIterator it = ScriptPointerList.begin(); it != ScriptPointerList.end(); ++it) + for (auto iterator = ScriptPointerList.begin(); iterator != ScriptPointerList.end(); ++iterator) { // If the script names match... - if (it->second->GetName() == script->GetName()) + if (iterator->second->GetName() == script->GetName()) { // ... It exists. existing = true; diff --git a/src/server/game/Server/Packets/PacketUtilities.cpp b/src/server/game/Server/Packets/PacketUtilities.cpp index ef1383d4bf..e73ab73806 100644 --- a/src/server/game/Server/Packets/PacketUtilities.cpp +++ b/src/server/game/Server/Packets/PacketUtilities.cpp @@ -8,7 +8,6 @@ #include "Errors.h" #include #include -#include WorldPackets::InvalidStringValueException::InvalidStringValueException(std::string const& value) : ByteBufferInvalidValueException("string", value.c_str()) { } diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 3b28b67b68..7bb2583c6a 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -1430,7 +1430,7 @@ void OpcodeTable::Initialize() #undef DEFINE_HANDLER #undef DEFINE_SERVER_OPCODE_HANDLER -}; +} template inline std::string GetOpcodeNameForLoggingImpl(T id) diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 9e4a1f7be9..ba01c8ad9e 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -86,7 +86,7 @@ bool WorldSessionFilter::Process(WorldPacket* packet) return true; //lets process all packets for non-in-the-world player - return (player->IsInWorld() == false); + return !player->IsInWorld(); } /// WorldSession constructor diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index 3bf054ce02..635b46843e 100644 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -5,7 +5,6 @@ */ #include "AccountMgr.h" -#include "BigNumber.h" #include "ByteBuffer.h" #include "Common.h" #include "CryptoHash.h" diff --git a/src/server/game/Server/WorldSocketMgr.cpp b/src/server/game/Server/WorldSocketMgr.cpp index 5c18eff698..b53ab7cf61 100644 --- a/src/server/game/Server/WorldSocketMgr.cpp +++ b/src/server/game/Server/WorldSocketMgr.cpp @@ -9,7 +9,6 @@ * \author Derex */ -#include "Common.h" #include "Config.h" #include "DatabaseEnv.h" #include "Log.h" @@ -23,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 5a6b8aae2a..32039ae6ea 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -379,7 +379,7 @@ AuraEffect::AuraEffect(Aura* base, uint8 effIndex, int32* baseAmount, Unit* cast m_amount = CalculateAmount(caster); m_casterLevel = caster ? caster->getLevel() : 0; - m_applyResilience = caster ? caster->CanApplyResilience() : false; + m_applyResilience = caster && caster->CanApplyResilience(); m_auraGroup = sSpellMgr->GetSpellGroup(GetId()); CalculateSpellMod(); @@ -5222,9 +5222,11 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool { if (target->isDead() && GetBase() && target->GetTypeId() == TYPEID_UNIT && target->GetEntry() == 24601) { - Unit* caster = GetBase()->GetCaster(); - if (caster && caster->GetTypeId() == TYPEID_PLAYER) - caster->ToPlayer()->KilledMonsterCredit(25987); + auto caster2 = GetBase()->GetCaster(); + if (caster2 && caster2->GetTypeId() == TYPEID_PLAYER) + { + caster2->ToPlayer()->KilledMonsterCredit(25987); + } } return; } @@ -6567,15 +6569,17 @@ void AuraEffect::HandlePeriodicHealAurasTick(Unit* target, Unit* caster) const // xinef: caster is available, checked earlier if (target != caster && GetSpellInfo()->HasAttribute(SPELL_ATTR2_NO_TARGET_PER_SECOND_COST)) { - uint32 damage = GetSpellInfo()->ManaPerSecond; - if ((int32)damage > gain && gain > 0) - damage = gain; + uint32 manaPerSecond = GetSpellInfo()->ManaPerSecond; + if ((int32)manaPerSecond > gain && gain > 0) + { + manaPerSecond = gain; + } - uint32 absorb = 0; - Unit::DealDamageMods(caster, damage, &absorb); + uint32 absorb2 = 0; + Unit::DealDamageMods(caster, manaPerSecond, &absorb2); CleanDamage cleanDamage = CleanDamage(0, 0, BASE_ATTACK, MELEE_HIT_NORMAL); - Unit::DealDamage(caster, caster, damage, &cleanDamage, SELF_DAMAGE, GetSpellInfo()->GetSchoolMask(), GetSpellInfo(), true); + Unit::DealDamage(caster, caster, manaPerSecond, &cleanDamage, SELF_DAMAGE, GetSpellInfo()->GetSchoolMask(), GetSpellInfo(), true); } uint32 procAttacker = PROC_FLAG_DONE_PERIODIC; diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index eaf10a1882..8c3529668f 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -2599,7 +2599,7 @@ UnitAura::UnitAura(SpellInfo const* spellproto, uint8 effMask, WorldObject* owne LoadScripts(); _InitEffects(effMask, caster, baseAmount); GetUnitOwner()->_AddAura(this, caster); -}; +} void UnitAura::_ApplyForTarget(Unit* target, Unit* caster, AuraApplication* aurApp) { diff --git a/src/server/game/Spells/Auras/SpellAuras.h b/src/server/game/Spells/Auras/SpellAuras.h index 2317cd77ca..23e336d771 100644 --- a/src/server/game/Spells/Auras/SpellAuras.h +++ b/src/server/game/Spells/Auras/SpellAuras.h @@ -21,7 +21,6 @@ class AuraEffect; class Aura; class DynamicObject; class AuraScript; -class ProcInfo; class AuraApplication { diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 13f24bcbf6..3dac35548d 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -4,7 +4,6 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "AccountMgr.h" #include "Battleground.h" #include "BattlegroundEY.h" #include "BattlegroundIC.h" @@ -14,22 +13,17 @@ #include "CellImpl.h" #include "Common.h" #include "Creature.h" -#include "CreatureAI.h" -#include "DatabaseEnv.h" #include "DynamicObject.h" #include "Formulas.h" #include "GameObject.h" #include "GameObjectAI.h" #include "GossipDef.h" #include "GridNotifiers.h" -#include "GridNotifiersImpl.h" #include "Group.h" #include "InstanceScript.h" #include "Language.h" #include "Log.h" #include "MapManager.h" -#include "MMapFactory.h" -#include "MMapManager.h" #include "ObjectAccessor.h" #include "ObjectMgr.h" #include "Opcodes.h" @@ -39,7 +33,6 @@ #include "ReputationMgr.h" #include "ScriptMgr.h" #include "SharedDefines.h" -#include "SkillDiscovery.h" #include "SkillExtraItems.h" #include "SocialMgr.h" #include "Spell.h" @@ -54,7 +47,6 @@ #include "UpdateMask.h" #include "Util.h" #include "Vehicle.h" -#include "VMapFactory.h" #include "World.h" #include "WorldPacket.h" diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index e494e2213a..37f57bcd5c 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -1849,7 +1849,7 @@ SpellCastResult SpellInfo::CheckTarget(Unit const* caster, WorldObject const* ta him, because it would be it's passenger, there's no such case where this gets to fail legitimacy, this problem cannot be solved from within the check in other way since target type cannot be called for the spell currently Spell examples: [ID - 52864 Devour Water, ID - 52862 Devour Wind, ID - 49370 Wyrmrest Defender: Destabilize Azure Dragonshrine Effect] */ - if (!caster->IsVehicle() && !(caster->GetCharmerOrOwner() == target)) + if (!caster->IsVehicle() && caster->GetCharmerOrOwner() != target) { if (TargetAuraState && !unitTarget->HasAuraState(AuraStateType(TargetAuraState), this, caster)) return SPELL_FAILED_TARGET_AURASTATE; diff --git a/src/server/game/Tools/PlayerDump.cpp b/src/server/game/Tools/PlayerDump.cpp index b41d315987..274934d605 100644 --- a/src/server/game/Tools/PlayerDump.cpp +++ b/src/server/game/Tools/PlayerDump.cpp @@ -9,7 +9,6 @@ #include "DatabaseEnv.h" #include "ObjectMgr.h" #include "PlayerDump.h" -#include "UpdateFields.h" #include "World.h" #define DUMP_TABLE_COUNT 27 diff --git a/src/server/game/Warden/Warden.cpp b/src/server/game/Warden/Warden.cpp index cbfffa2bf2..0f3ebfbd0e 100644 --- a/src/server/game/Warden/Warden.cpp +++ b/src/server/game/Warden/Warden.cpp @@ -17,7 +17,6 @@ #include "World.h" #include "WorldPacket.h" #include "WorldSession.h" -#include #include Warden::Warden() : _session(nullptr), _checkTimer(10000/*10 sec*/), _clientResponseTimer(0), @@ -281,7 +280,7 @@ bool Warden::ProcessLuaCheckResponse(std::string const& msg) { static constexpr char WARDEN_TOKEN[] = "_TW\t"; // if msg starts with WARDEN_TOKEN - if (!(msg.rfind(WARDEN_TOKEN, 0) == 0)) + if (msg.rfind(WARDEN_TOKEN, 0) != 0) { return false; } diff --git a/src/server/game/Warden/WardenCheckMgr.cpp b/src/server/game/Warden/WardenCheckMgr.cpp index 0f1321a263..ed58770e70 100644 --- a/src/server/game/Warden/WardenCheckMgr.cpp +++ b/src/server/game/Warden/WardenCheckMgr.cpp @@ -4,13 +4,11 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Common.h" #include "Database/DatabaseEnv.h" #include "Log.h" #include "Util.h" #include "Warden.h" #include "WardenCheckMgr.h" -#include "WorldPacket.h" #include "WorldSession.h" WardenCheckMgr::WardenCheckMgr() @@ -128,9 +126,9 @@ void WardenCheckMgr::LoadWardenChecks() continue; } - std::string str = fmt::sprintf("%04u", id); - ASSERT(str.size() == 4); - std::copy(str.begin(), str.end(), wardenCheck.IdStr.begin()); + std::string str2 = Acore::StringFormat("%04u", id); + ASSERT(str2.size() == 4); + std::copy(str2.begin(), str2.end(), wardenCheck.IdStr.begin()); CheckIdPool[WARDEN_CHECK_LUA_TYPE].push_back(id); break; diff --git a/src/server/game/Warden/WardenMac.cpp b/src/server/game/Warden/WardenMac.cpp index f8f20ddc4e..7bbd134558 100644 --- a/src/server/game/Warden/WardenMac.cpp +++ b/src/server/game/Warden/WardenMac.cpp @@ -5,15 +5,12 @@ */ #include "ByteBuffer.h" -#include "Common.h" -#include "Log.h" #include "Opcodes.h" #include "Player.h" #include "SessionKeyGenerator.h" #include "Util.h" #include "WardenMac.h" #include "WardenModuleMac.h" -#include "World.h" #include "WorldPacket.h" #include "WorldSession.h" #include diff --git a/src/server/game/Warden/WardenWin.cpp b/src/server/game/Warden/WardenWin.cpp index 7753901907..a94ecfa9a4 100644 --- a/src/server/game/Warden/WardenWin.cpp +++ b/src/server/game/Warden/WardenWin.cpp @@ -4,13 +4,10 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "AccountMgr.h" #include "ByteBuffer.h" #include "Common.h" #include "CryptoRandom.h" -#include "Database/DatabaseEnv.h" #include "HMAC.h" -#include "Log.h" #include "Opcodes.h" #include "Player.h" #include "SessionKeyGenerator.h" diff --git a/src/server/game/Weather/Weather.cpp b/src/server/game/Weather/Weather.cpp index 4402ab9d9a..ad0df6282e 100644 --- a/src/server/game/Weather/Weather.cpp +++ b/src/server/game/Weather/Weather.cpp @@ -8,15 +8,12 @@ \ingroup world */ -#include "Log.h" -#include "ObjectMgr.h" #include "Player.h" #include "ScriptMgr.h" #include "Util.h" #include "Weather.h" #include "World.h" #include "WorldPacket.h" -#include "WorldSession.h" /// Create the Weather object Weather::Weather(uint32 zone, WeatherData const* weatherChances) diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index c9f6c3aacf..b195db41d1 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -18,7 +18,6 @@ #include "BattlefieldMgr.h" #include "BattlegroundMgr.h" #include "CalendarMgr.h" -#include "CellImpl.h" #include "Channel.h" #include "ChannelMgr.h" #include "CharacterDatabaseCleaner.h" @@ -63,7 +62,6 @@ #include "SkillExtraItems.h" #include "SmartAI.h" #include "SpellMgr.h" -#include "TemporarySummon.h" #include "TicketMgr.h" #include "Transport.h" #include "TransportMgr.h" diff --git a/src/server/shared/DataStores/DBCDatabaseLoader.cpp b/src/server/shared/DataStores/DBCDatabaseLoader.cpp index 7894c78356..6c2628fa6c 100644 --- a/src/server/shared/DataStores/DBCDatabaseLoader.cpp +++ b/src/server/shared/DataStores/DBCDatabaseLoader.cpp @@ -4,13 +4,10 @@ * Copyright (C) 2005-2009 MaNGOS */ -#include "Common.h" #include "DatabaseEnv.h" #include "DBCDatabaseLoader.h" #include "Errors.h" -#include "Log.h" #include "StringFormat.h" -#include DBCDatabaseLoader::DBCDatabaseLoader(char const* tableName, char const* dbcFormatString, std::vector& stringPool) : _sqlTableName(tableName), diff --git a/src/server/shared/Network/RealmSocket.cpp b/src/server/shared/Network/RealmSocket.cpp index d94e83616b..03b3a1b9f8 100644 --- a/src/server/shared/Network/RealmSocket.cpp +++ b/src/server/shared/Network/RealmSocket.cpp @@ -8,7 +8,6 @@ #include "RealmSocket.h" #include #include -#include RealmSocket::Session::Session() = default; diff --git a/src/server/shared/Packets/ByteBuffer.cpp b/src/server/shared/Packets/ByteBuffer.cpp index 11b5f3ad56..6cf8fa0c7c 100644 --- a/src/server/shared/Packets/ByteBuffer.cpp +++ b/src/server/shared/Packets/ByteBuffer.cpp @@ -6,7 +6,6 @@ #include "ByteBuffer.h" #include "Errors.h" #include "MessageBuffer.h" -#include "Common.h" #include "Log.h" #include "Util.h" #include diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h index c60cdcefd1..08422f35b2 100644 --- a/src/server/shared/Packets/ByteBuffer.h +++ b/src/server/shared/Packets/ByteBuffer.h @@ -220,7 +220,7 @@ public: ByteBuffer& operator>>(bool& value) { - value = read() > 0 ? true : false; + value = read() > 0; return *this; } diff --git a/src/server/shared/Secrets/SecretMgr.cpp b/src/server/shared/Secrets/SecretMgr.cpp index 4082da3669..8ca83895a0 100644 --- a/src/server/shared/Secrets/SecretMgr.cpp +++ b/src/server/shared/Secrets/SecretMgr.cpp @@ -13,7 +13,6 @@ #include "Log.h" #include "SharedDefines.h" #include -#include #define SECRET_FLAG_FOR(key, val, server) server ## _ ## key = (val ## ull << (16*SERVER_PROCESS_ ## server)) #define SECRET_FLAG(key, val) SECRET_FLAG_ ## key = val, SECRET_FLAG_FOR(key, val, AUTHSERVER), SECRET_FLAG_FOR(key, val, WORLDSERVER) @@ -137,7 +136,7 @@ void SecretMgr::AttemptLoad(Secrets i, LogLevel errorLevel, std::unique_lock error = AttemptTransition(Secrets(i), currentValue, oldSecret, !!oldDigest); + Optional error = AttemptTransition(Secrets(i), currentValue, oldSecret, static_cast(oldDigest)); if (error) { LOG_MESSAGE_BODY("server.loading", errorLevel, "Your value of '%s' changed, but we cannot transition your database to the new value:\n%s", info.configKey, error->c_str()); diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index 276d963cf0..2e458e8b44 100644 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -10,7 +10,6 @@ #include "AppenderDB.h" #include "Banner.h" -#include "Common.h" #include "Configuration/Config.h" #include "Database/DatabaseEnv.h" #include "Log.h" diff --git a/src/server/worldserver/Master.cpp b/src/server/worldserver/Master.cpp index 82551d29d9..eb0747e349 100644 --- a/src/server/worldserver/Master.cpp +++ b/src/server/worldserver/Master.cpp @@ -15,7 +15,6 @@ #include "Common.h" #include "Config.h" #include "DatabaseEnv.h" -#include "DatabaseWorkerPool.h" #include "GitRevision.h" #include "IoContext.h" #include "Log.h"