From 423bb7f0b3ae6e053de7c49b8370bd196849bc71 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Sat, 11 Apr 2020 01:58:35 -0500 Subject: [PATCH] Adjust content bootstrapping in zone [skip ci] --- common/ruletypes.h | 2 +- zone/main.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/common/ruletypes.h b/common/ruletypes.h index af70bf3c1..281fc35fb 100644 --- a/common/ruletypes.h +++ b/common/ruletypes.h @@ -776,7 +776,7 @@ RULE_BOOL(HotReload, QuestsResetTimersWithReload, true, "When a hot reload is tr RULE_CATEGORY_END() RULE_CATEGORY(Expansion) -RULE_INT(Expansion, CurrentExpansion, -1, "The current expansion enabled for the server [0 = Classic, 1 = Kunark etc.]") +RULE_INT(Expansion, CurrentExpansion, 0, "The current expansion enabled for the server [0 = Classic, 1 = Kunark etc.]") RULE_CATEGORY_END() #undef RULE_CATEGORY diff --git a/zone/main.cpp b/zone/main.cpp index a04884286..53c3b52d1 100644 --- a/zone/main.cpp +++ b/zone/main.cpp @@ -395,7 +395,10 @@ int main(int argc, char** argv) { LogInfo("Initialized dynamic dictionary entries"); } - content_service.SetCurrentExpansion(RuleI(Expansion, CurrentExpansion)); + int current_expansion = RuleI(Expansion, CurrentExpansion); + if (current_expansion >= Expansion::Classic && current_expansion <= Expansion::MaxId) { + content_service.SetCurrentExpansion(current_expansion); + } LogInfo( "Current expansion is [{}] ({})",