pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-29 16:42:25 +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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/database_conversions.cpp
View File

@ -476,10 +476,11 @@ bool Database::CheckDatabaseConversions() {
CheckDatabaseConvertPPDeblob(); CheckDatabaseConvertPPDeblob();
CheckDatabaseConvertCorpseDeblob(); CheckDatabaseConvertCorpseDeblob();
RuleManager::Instance()->LoadRules(this, "default", false); auto *r = RuleManager::Instance();
r->LoadRules(this, "default", false);
if (!RuleB(Bots, Enabled) && DoesTableExist("bot_data")) { if (!RuleB(Bots, Enabled) && DoesTableExist("bot_data")) {
LogInfo("Bot tables found but rule not enabled, enabling"); LogInfo("Bot tables found but rule not enabled, enabling");
RuleManager::Instance()->SetRule("Bots:Enabled", "true", this, true, true); r->SetRule("Bots:Enabled", "true", this, true, true);
} }
/* Run EQEmu Server script (Checks for database updates) */ /* Run EQEmu Server script (Checks for database updates) */

11
common/rulesys.cpp
View File

@ -385,7 +385,16 @@ void RuleManager::_SaveRule(Database *db, RuleType type, uint16 index) {
e.rule_value = rule_value; e.rule_value = rule_value;
e.notes = rule_notes; e.notes = rule_notes;
RuleValuesRepository::UpdateOne(*db, e); db->QueryDatabase(
fmt::format(
"UPDATE rule_values SET rule_value = '{}', notes = '{}' WHERE ruleset_id = {} AND rule_name = '{}'",
rule_value,
Strings::Escape(rule_notes),
e.ruleset_id,
e.rule_name
)
);
return; return;
} }

9
world/cli/database_version.cpp
View File

@ -1,5 +1,6 @@
#include "../../common/version.h" #include "../../common/version.h"
#include "../../common/json/json.h" #include "../../common/json/json.h"
#include "../../common/rulesys.h"
void WorldserverCLI::DatabaseVersion(int argc, char **argv, argh::parser &cmd, std::string &description) 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; return;
} }
Json::Value database_version; Json::Value v;
database_version["database_version"] = CURRENT_BINARY_DATABASE_VERSION; v["database_version"] = CURRENT_BINARY_DATABASE_VERSION;
database_version["bots_database_version"] = CURRENT_BINARY_BOTS_DATABASE_VERSION; v["bots_database_version"] = RuleB(Bots, Enabled) ? CURRENT_BINARY_BOTS_DATABASE_VERSION : 0;
std::stringstream payload; std::stringstream payload;
payload << database_version; payload << v;
std::cout << payload.str() << std::endl; std::cout << payload.str() << std::endl;
} }

10
world/world_boot.cpp
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 // logging system init
auto logging = LogSys.SetDatabase(&database) auto logging = LogSys.SetDatabase(&database)
->SetLogPath(path.GetLogPath()) ->SetLogPath(path.GetLogPath())
->LoadLogDatabaseSettings(); ->LoadLogDatabaseSettings();
if (!ignore_db) {
LogInfo("Checking Database Conversions");
database.CheckDatabaseConversions();
}
if (RuleB(Logging, WorldGMSayLogging)) { if (RuleB(Logging, WorldGMSayLogging)) {
logging->SetGMSayHandler(&WorldBoot::GMSayHookCallBackProcessWorld); logging->SetGMSayHandler(&WorldBoot::GMSayHookCallBackProcessWorld);
} }