diff options
author | sudlud <sudlud@users.noreply.github.com> | 2024-09-03 13:02:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-09-03 08:02:28 -0300 |
commit | c929b95172c88d5257077dbbdebb9ca8fabbad26 (patch) | |
tree | 50aae737ca3e40092c5d2c99a4a094609bb5050c /src | |
parent | 9af86553c50c0c84bee35c5024a01d000277208c (diff) |
fix(Conf): sync default values with core defaults (#19708)
fix(Conf): sync values with core defaults
Diffstat (limited to 'src')
-rw-r--r-- | src/server/apps/worldserver/Main.cpp | 4 | ||||
-rw-r--r-- | src/server/apps/worldserver/worldserver.conf.dist | 38 | ||||
-rw-r--r-- | src/server/database/Database/DatabaseLoader.h | 2 | ||||
-rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 2 | ||||
-rw-r--r-- | src/server/game/Time/UpdateTime.cpp | 2 | ||||
-rw-r--r-- | src/server/game/World/World.cpp | 16 |
6 files changed, 32 insertions, 32 deletions
diff --git a/src/server/apps/worldserver/Main.cpp b/src/server/apps/worldserver/Main.cpp index 3adfb59655..0b485bffad 100644 --- a/src/server/apps/worldserver/Main.cpp +++ b/src/server/apps/worldserver/Main.cpp @@ -233,7 +233,7 @@ int main(int argc, char** argv) signals.async_wait(SignalHandler); // Start the Boost based thread pool - int numThreads = sConfigMgr->GetOption<int32>("ThreadPool", 1); + int numThreads = sConfigMgr->GetOption<int32>("ThreadPool", 2); std::shared_ptr<std::vector<std::thread>> threadPool(new std::vector<std::thread>(), [ioContext](std::vector<std::thread>* del) { ioContext->stop(); @@ -257,7 +257,7 @@ int main(int argc, char** argv) } // Set process priority according to configuration settings - SetProcessPriority("server.worldserver", sConfigMgr->GetOption<int32>(CONFIG_PROCESSOR_AFFINITY, 0), sConfigMgr->GetOption<bool>(CONFIG_HIGH_PRIORITY, false)); + SetProcessPriority("server.worldserver", sConfigMgr->GetOption<int32>(CONFIG_PROCESSOR_AFFINITY, 0), sConfigMgr->GetOption<bool>(CONFIG_HIGH_PRIORITY, true)); // Loading modules configs before scripts sConfigMgr->LoadModulesConfigs(); diff --git a/src/server/apps/worldserver/worldserver.conf.dist b/src/server/apps/worldserver/worldserver.conf.dist index 53038ffde3..2b2f58f2eb 100644 --- a/src/server/apps/worldserver/worldserver.conf.dist +++ b/src/server/apps/worldserver/worldserver.conf.dist @@ -139,13 +139,13 @@ CharacterDatabase.WorkerThreads = 1 # WorldDatabase.SynchThreads # CharacterDatabase.SynchThreads # Description: The amount of MySQL connections spawned to handle. -# Default: 1 - (LoginDatabase.WorkerThreads) -# 1 - (WorldDatabase.WorkerThreads) -# 2 - (CharacterDatabase.WorkerThreads) +# Default: 1 - (LoginDatabase.SynchThreads) +# 1 - (WorldDatabase.SynchThreads) +# 1 - (CharacterDatabase.SynchThreads) LoginDatabase.SynchThreads = 1 WorldDatabase.SynchThreads = 1 -CharacterDatabase.SynchThreads = 2 +CharacterDatabase.SynchThreads = 1 # # MaxPingTime @@ -1040,7 +1040,7 @@ MinWorldUpdateTime = 1 # Default: 10 - (10 minutes) # 1+ -UpdateUptimeInterval = 1 +UpdateUptimeInterval = 10 # # MaxCoreStuckTime @@ -1219,7 +1219,7 @@ Warden.ClientCheckFailAction = 0 # Default: 86400 - (24 hours) # 0 - (Permanent ban) -Warden.BanDuration = 259200 +Warden.BanDuration = 86400 # ################################################################################################### @@ -1277,17 +1277,17 @@ Visibility.GroupMode = 1 # Visibility.Distance.Instances # Visibility.Distance.BGArenas # Description: Visibility distance to see other players or gameobjects. -# Visibility on continents on retail ~90 yards. In BG/Arenas ~180. -# For instances default ~120. +# Visibility on continents on retail ~100 yards. In BG/Arenas ~533. +# For instances default ~170. # Max limited by active player zone: ~ 333 # Min limit is max aggro radius (45) * Rate.Creature.Aggro -# Default: 90 - (Visibility.Distance.Continents) -# 120 - (Visibility.Distance.Instances) -# 180 - (Visibility.Distance.BGArenas) +# Default: 100 - (Visibility.Distance.Continents) +# 170 - (Visibility.Distance.Instances) +# 533 - (Visibility.Distance.BGArenas) -Visibility.Distance.Continents = 90 -Visibility.Distance.Instances = 120 -Visibility.Distance.BGArenas = 180 +Visibility.Distance.Continents = 100 +Visibility.Distance.Instances = 170 +Visibility.Distance.BGArenas = 533 # # Visibility.ObjectSparkles @@ -2540,7 +2540,7 @@ Death.SicknessLevel = 11 # 0 - (Disabled) Death.CorpseReclaimDelay.PvP = 1 -Death.CorpseReclaimDelay.PvE = 0 +Death.CorpseReclaimDelay.PvE = 1 # # Death.Bones.World @@ -3415,7 +3415,7 @@ Wintergrasp.Enable = 1 # Description: Maximum number of players allowed in Wintergrasp. # Default: 100 -Wintergrasp.PlayerMax = 120 +Wintergrasp.PlayerMax = 100 # # Wintergrasp.PlayerMin @@ -3566,14 +3566,14 @@ Battleground.Random.ResetHour = 6 # Default: 0 - (Disabled) # 1 - (Enabled) -Battleground.StoreStatistics.Enable = 1 +Battleground.StoreStatistics.Enable = 0 # Battleground.TrackDeserters.Enable # Description: Track deserters of Battlegrounds. # Default: 0 - (Disabled) # 1 - (Enabled) -Battleground.TrackDeserters.Enable = 1 +Battleground.TrackDeserters.Enable = 0 # # Battleground.InvitationType @@ -4064,7 +4064,7 @@ PartyLevelReq = 1 # Default: 0 - (Disabled, Blizzlike, Channel settings are lost if last person left) # 1 - (Enabled) -PreserveCustomChannels = 1 +PreserveCustomChannels = 0 # # PreserveCustomChannelDuration diff --git a/src/server/database/Database/DatabaseLoader.h b/src/server/database/Database/DatabaseLoader.h index 44aaca1992..233b0a5be9 100644 --- a/src/server/database/Database/DatabaseLoader.h +++ b/src/server/database/Database/DatabaseLoader.h @@ -32,7 +32,7 @@ class DatabaseWorkerPool; class AC_DATABASE_API DatabaseLoader { public: - DatabaseLoader(std::string const& logger, uint32 const defaultUpdateMask = 0, std::string_view modulesList = {}); + DatabaseLoader(std::string const& logger, uint32 const defaultUpdateMask = 7, std::string_view modulesList = {}); // Register a database to the loader (lazy implemented) template <class T> diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index cfe00b79d2..f2fca152a4 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -948,7 +948,7 @@ void ObjectMgr::LoadCreatureTemplateAddons() void ObjectMgr::LoadCreatureCustomIDs() { // Hack for modules - std::string stringCreatureIds = sConfigMgr->GetOption<std::string>("Creatures.CustomIDs", ""); + std::string stringCreatureIds = sConfigMgr->GetOption<std::string>("Creatures.CustomIDs", "190010,55005,999991,25462,98888,601014,34567,34568"); std::vector<std::string_view> CustomCreatures = Acore::Tokenize(stringCreatureIds, ',', false); for (auto& itr : CustomCreatures) diff --git a/src/server/game/Time/UpdateTime.cpp b/src/server/game/Time/UpdateTime.cpp index 75244b19ef..3b584a6155 100644 --- a/src/server/game/Time/UpdateTime.cpp +++ b/src/server/game/Time/UpdateTime.cpp @@ -151,7 +151,7 @@ void UpdateTime::SortUpdateTimeDataTable() void WorldUpdateTime::LoadFromConfig() { - _recordUpdateTimeInverval = Milliseconds(sConfigMgr->GetOption<uint32>("RecordUpdateTimeDiffInterval", 60000)); + _recordUpdateTimeInverval = Milliseconds(sConfigMgr->GetOption<uint32>("RecordUpdateTimeDiffInterval", 300000)); _recordUpdateTimeMin = Milliseconds(sConfigMgr->GetOption<uint32>("MinRecordUpdateTimeDiff", 100)); } diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 96cb3dd146..8350e4e726 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -976,15 +976,15 @@ void World::LoadConfigSettings(bool reload) _int_configs[CONFIG_TELEPORT_TIMEOUT_FAR] = sConfigMgr->GetOption<int32>("TeleportTimeoutFar", 45); // pussywizard _int_configs[CONFIG_MAX_ALLOWED_MMR_DROP] = sConfigMgr->GetOption<int32>("MaxAllowedMMRDrop", 500); // pussywizard _bool_configs[CONFIG_ENABLE_LOGIN_AFTER_DC] = sConfigMgr->GetOption<bool>("EnableLoginAfterDC", true); // pussywizard - _bool_configs[CONFIG_DONT_CACHE_RANDOM_MOVEMENT_PATHS] = sConfigMgr->GetOption<bool>("DontCacheRandomMovementPaths", true); // pussywizard + _bool_configs[CONFIG_DONT_CACHE_RANDOM_MOVEMENT_PATHS] = sConfigMgr->GetOption<bool>("DontCacheRandomMovementPaths", false); _int_configs[CONFIG_SKILL_CHANCE_ORANGE] = sConfigMgr->GetOption<int32>("SkillChance.Orange", 100); _int_configs[CONFIG_SKILL_CHANCE_YELLOW] = sConfigMgr->GetOption<int32>("SkillChance.Yellow", 75); _int_configs[CONFIG_SKILL_CHANCE_GREEN] = sConfigMgr->GetOption<int32>("SkillChance.Green", 25); _int_configs[CONFIG_SKILL_CHANCE_GREY] = sConfigMgr->GetOption<int32>("SkillChance.Grey", 0); - _int_configs[CONFIG_SKILL_CHANCE_MINING_STEPS] = sConfigMgr->GetOption<int32>("SkillChance.MiningSteps", 75); - _int_configs[CONFIG_SKILL_CHANCE_SKINNING_STEPS] = sConfigMgr->GetOption<int32>("SkillChance.SkinningSteps", 75); + _int_configs[CONFIG_SKILL_CHANCE_MINING_STEPS] = sConfigMgr->GetOption<int32>("SkillChance.MiningSteps", 0); + _int_configs[CONFIG_SKILL_CHANCE_SKINNING_STEPS] = sConfigMgr->GetOption<int32>("SkillChance.SkinningSteps", 0); _bool_configs[CONFIG_SKILL_PROSPECTING] = sConfigMgr->GetOption<bool>("SkillChance.Prospecting", false); _bool_configs[CONFIG_SKILL_MILLING] = sConfigMgr->GetOption<bool>("SkillChance.Milling", false); @@ -1086,7 +1086,7 @@ void World::LoadConfigSettings(bool reload) _bool_configs[CONFIG_SILENTLY_GM_JOIN_TO_CHANNEL] = sConfigMgr->GetOption<bool>("Channel.SilentlyGMJoin", false); _bool_configs[CONFIG_TALENTS_INSPECTING] = sConfigMgr->GetOption<bool>("TalentsInspecting", true); - _bool_configs[CONFIG_CHAT_FAKE_MESSAGE_PREVENTING] = sConfigMgr->GetOption<bool>("ChatFakeMessagePreventing", false); + _bool_configs[CONFIG_CHAT_FAKE_MESSAGE_PREVENTING] = sConfigMgr->GetOption<bool>("ChatFakeMessagePreventing", true); _int_configs[CONFIG_CHAT_STRICT_LINK_CHECKING_SEVERITY] = sConfigMgr->GetOption<int32>("ChatStrictLinkChecking.Severity", 0); _int_configs[CONFIG_CHAT_STRICT_LINK_CHECKING_KICK] = sConfigMgr->GetOption<int32>("ChatStrictLinkChecking.Kick", 0); @@ -1171,10 +1171,10 @@ void World::LoadConfigSettings(bool reload) _bool_configs[CONFIG_ARENA_AUTO_DISTRIBUTE_POINTS] = sConfigMgr->GetOption<bool>("Arena.AutoDistributePoints", false); _int_configs[CONFIG_ARENA_AUTO_DISTRIBUTE_INTERVAL_DAYS] = sConfigMgr->GetOption<uint32>("Arena.AutoDistributeInterval", 7); // pussywizard: spoiled by implementing constant day and hour, always 7 now _int_configs[CONFIG_ARENA_GAMES_REQUIRED] = sConfigMgr->GetOption<uint32>("Arena.GamesRequired", 10); - _int_configs[CONFIG_ARENA_SEASON_ID] = sConfigMgr->GetOption<uint32>("Arena.ArenaSeason.ID", 1); + _int_configs[CONFIG_ARENA_SEASON_ID] = sConfigMgr->GetOption<uint32>("Arena.ArenaSeason.ID", 8); _int_configs[CONFIG_ARENA_START_RATING] = sConfigMgr->GetOption<uint32>("Arena.ArenaStartRating", 0); _int_configs[CONFIG_LEGACY_ARENA_POINTS_CALC] = sConfigMgr->GetOption<uint32>("Arena.LegacyArenaPoints", 0); - _int_configs[CONFIG_ARENA_START_PERSONAL_RATING] = sConfigMgr->GetOption<uint32>("Arena.ArenaStartPersonalRating", 1000); + _int_configs[CONFIG_ARENA_START_PERSONAL_RATING] = sConfigMgr->GetOption<uint32>("Arena.ArenaStartPersonalRating", 0); _int_configs[CONFIG_ARENA_START_MATCHMAKER_RATING] = sConfigMgr->GetOption<uint32>("Arena.ArenaStartMatchmakerRating", 1500); _bool_configs[CONFIG_ARENA_SEASON_IN_PROGRESS] = sConfigMgr->GetOption<bool>("Arena.ArenaSeason.InProgress", true); _float_configs[CONFIG_ARENA_WIN_RATING_MODIFIER_1] = sConfigMgr->GetOption<float>("Arena.ArenaWinRatingModifier1", 48.0f); @@ -1315,8 +1315,8 @@ void World::LoadConfigSettings(bool reload) LOG_INFO("server.loading", "Using DataDir {}", _dataPath); } - _bool_configs[CONFIG_VMAP_INDOOR_CHECK] = sConfigMgr->GetOption<bool>("vmap.enableIndoorCheck", 0); bool enableIndoor = sConfigMgr->GetOption<bool>("vmap.enableIndoorCheck", true); + _bool_configs[CONFIG_VMAP_INDOOR_CHECK] = enableIndoor; bool enableLOS = sConfigMgr->GetOption<bool>("vmap.enableLOS", true); bool enableHeight = sConfigMgr->GetOption<bool>("vmap.enableHeight", true); bool enablePetLOS = sConfigMgr->GetOption<bool>("vmap.petLOS", true); @@ -1330,7 +1330,7 @@ void World::LoadConfigSettings(bool reload) VMAP::VMapFactory::createOrGetVMapMgr()->setEnableHeightCalc(enableHeight); LOG_INFO("server.loading", "WORLD: VMap support included. LineOfSight:{}, getHeight:{}, indoorCheck:{} PetLOS:{}", enableLOS, enableHeight, enableIndoor, enablePetLOS); - _bool_configs[CONFIG_PET_LOS] = sConfigMgr->GetOption<bool>("vmap.petLOS", true); + _bool_configs[CONFIG_PET_LOS] = enablePetLOS; _bool_configs[CONFIG_START_CUSTOM_SPELLS] = sConfigMgr->GetOption<bool>("PlayerStart.CustomSpells", false); _int_configs[CONFIG_HONOR_AFTER_DUEL] = sConfigMgr->GetOption<int32>("HonorPointsAfterDuel", 0); _bool_configs[CONFIG_START_ALL_EXPLORED] = sConfigMgr->GetOption<bool>("PlayerStart.MapsExplored", false); |