pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-04 22:56:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Rules] Fix rule updates that affected bot booting checks (#2841)

Browse Source
This commit is contained in:
Chris Miles
2023-02-06 17:31:50 -06:00
committed by GitHub
parent 155ec9ac0d
commit 2b224d42ad
4 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/cli/database_version.cpp
+5 -4
View File
@@ -1,5 +1,6 @@
#include "../../common/version.h"
#include "../../common/json/json.h"
#include "../../common/rulesys.h"
void WorldserverCLI::DatabaseVersion(int argc, char **argv, argh::parser &cmd, std::string &description)
{
@@ -9,13 +10,13 @@ void WorldserverCLI::DatabaseVersion(int argc, char **argv, argh::parser &cmd, s
return;
}
Json::Value database_version;
Json::Value v;
database_version["database_version"] = CURRENT_BINARY_DATABASE_VERSION;
database_version["bots_database_version"] = CURRENT_BINARY_BOTS_DATABASE_VERSION;
v["database_version"] = CURRENT_BINARY_DATABASE_VERSION;
v["bots_database_version"] = RuleB(Bots, Enabled) ? CURRENT_BINARY_BOTS_DATABASE_VERSION : 0;
std::stringstream payload;
payload << database_version;
payload << v;
std::cout << payload.str() << std::endl;
}
world/world_boot.cpp
+5 -5
View File
@@ -290,16 +290,16 @@ bool WorldBoot::DatabaseLoadRoutines(int argc, char **argv)
}
}
if (!ignore_db) {
LogInfo("Checking Database Conversions");
database.CheckDatabaseConversions();
}
// logging system init
auto logging = LogSys.SetDatabase(&database)
->SetLogPath(path.GetLogPath())
->LoadLogDatabaseSettings();
if (!ignore_db) {
LogInfo("Checking Database Conversions");
database.CheckDatabaseConversions();
}
if (RuleB(Logging, WorldGMSayLogging)) {
logging->SetGMSayHandler(&WorldBoot::GMSayHookCallBackProcessWorld);
}