sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into Playerbot

Browse Source
This commit is contained in:
Yunfan Li
2024-08-18 23:02:22 +08:00
parent 33e4bc8390 a0689fb4ef
commit 27b243e7b2
50 changed files with 2365 additions and 1344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/World/IWorld.h
+1
View File
@@ -139,6 +139,7 @@ enum WorldBoolConfigs
CONFIG_AUTOBROADCAST,
CONFIG_ALLOW_TICKETS,
CONFIG_DELETE_CHARACTER_TICKET_TRACE,
CONFIG_LFG_CAST_DESERTER,
CONFIG_DBC_ENFORCE_ITEM_ATTRIBUTES,
CONFIG_PRESERVE_CUSTOM_CHANNELS,
CONFIG_PDUMP_NO_PATHS,
src/server/game/World/World.cpp
+9 -2
View File
@@ -1363,7 +1363,9 @@ void World::LoadConfigSettings(bool reload)
_int_configs[CONFIG_WARDEN_CLIENT_RESPONSE_DELAY] = sConfigMgr->GetOption<int32>("Warden.ClientResponseDelay", 600);
// Dungeon finder
_int_configs[CONFIG_LFG_OPTIONSMASK] = sConfigMgr->GetOption<int32>("DungeonFinder.OptionsMask", 5);
_int_configs[CONFIG_LFG_OPTIONSMASK] = sConfigMgr->GetOption<int32>("DungeonFinder.OptionsMask", 5);
_bool_configs[CONFIG_LFG_CAST_DESERTER] = sConfigMgr->GetOption<int32>("DungeonFinder.CastDeserter", true);
// DBC_ItemAttributes
_bool_configs[CONFIG_DBC_ENFORCE_ITEM_ATTRIBUTES] = sConfigMgr->GetOption<bool>("DBC.EnforceItemAttributes", true);
@@ -1543,6 +1545,11 @@ void World::SetInitialWorldSettings()
if (!sObjectMgr->LoadAcoreStrings())
exit(1); // Error message displayed in function already
LOG_INFO("server.loading", "Loading Module Strings...");
sObjectMgr->LoadModuleStrings();
LOG_INFO("server.loading", "Loading Module Strings Locale...");
sObjectMgr->LoadModuleStringsLocale();
///- Update the realm entry in the database with the realm type from the config file
//No SQL injection as values are treated as integers
@@ -1789,7 +1796,7 @@ void World::SetInitialWorldSettings()
LOG_INFO("server.loading", "Loading Quest Greetings...");
sObjectMgr->LoadQuestGreetings(); // must be loaded after creature_template, gameobject_template tables
LOG_INFO("server.loading", "Loading Quest Greeting Locales...");
sObjectMgr->LoadQuestGreetingsLocales(); // must be loaded after creature_template, gameobject_template tables
sObjectMgr->LoadQuestGreetingsLocales(); // must be loaded after creature_template, gameobject_template tables, quest_greeting
LOG_INFO("server.loading", "Loading Quest Money Rewards...");
sObjectMgr->LoadQuestMoneyRewards();