Adjust content bootstrapping in zone [skip ci]

This commit is contained in:
Akkadius 2020-04-11 01:58:35 -05:00
parent 2b1b786f02
commit 423bb7f0b3
2 changed files with 5 additions and 2 deletions

View File

@ -776,7 +776,7 @@ RULE_BOOL(HotReload, QuestsResetTimersWithReload, true, "When a hot reload is tr
RULE_CATEGORY_END() RULE_CATEGORY_END()
RULE_CATEGORY(Expansion) 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() RULE_CATEGORY_END()
#undef RULE_CATEGORY #undef RULE_CATEGORY

View File

@ -395,7 +395,10 @@ int main(int argc, char** argv) {
LogInfo("Initialized dynamic dictionary entries"); 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( LogInfo(
"Current expansion is [{}] ({})", "Current expansion is [{}] ({})",