From 00af47178d70edcf1986ab5446c28dccf6318fee Mon Sep 17 00:00:00 2001 From: "George V." Date: Mon, 13 Apr 2026 22:47:01 +0300 Subject: [PATCH] refactor: Remove worldSizeChunks param from BiomeSource::findSeed --- Minecraft.Client/MinecraftServer.cpp | 4 +++- Minecraft.Server/Windows64/ServerMain.cpp | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Minecraft.Client/MinecraftServer.cpp b/Minecraft.Client/MinecraftServer.cpp index 4406cdab..747d7ca6 100644 --- a/Minecraft.Client/MinecraftServer.cpp +++ b/Minecraft.Client/MinecraftServer.cpp @@ -742,7 +742,9 @@ bool MinecraftServer::initServer(int64_t seed, NetworkGameInitData *initData, DW #ifdef __PSVITA__ seed = BiomeSource::findSeed(pLevelType, &running, worldSizeChunks); #else - seed = BiomeSource::findSeed(pLevelType, worldSizeChunks); + // LordCambion changes removed the worldSizeChunks param from BiomeSource#findSeed + // seed = BiomeSource::findSeed(pLevelType, worldSizeChunks); + seed = BiomeSource::findSeed(pLevelType); #endif } diff --git a/Minecraft.Server/Windows64/ServerMain.cpp b/Minecraft.Server/Windows64/ServerMain.cpp index a51f9d05..cd1119a6 100644 --- a/Minecraft.Server/Windows64/ServerMain.cpp +++ b/Minecraft.Server/Windows64/ServerMain.cpp @@ -650,8 +650,10 @@ int main(int argc, char **argv) { // Only run seed validation when creating a brand-new world. // Existing worlds already have their seed in level.dat. - LogInfof("startup", "Finding seed with biome diversity for %d-chunk world...", config.worldSizeChunks); - param->seed = BiomeSource::findSeed(LevelType::lvl_normal, config.worldSizeChunks); + LogInfof("startup", "Finding seed with biome diversity for %d-chunk world...", config.worldSizeChunks); + // LordCambion changes removed the worldSizeChunks param from BiomeSource#findSeed + // param->seed = BiomeSource::findSeed(LevelType::lvl_normal, config.worldSizeChunks); + param->seed = BiomeSource::findSeed(LevelType::lvl_normal); LogInfof("startup", "Selected seed: %lld", param->seed); } else @@ -735,7 +737,7 @@ int main(int argc, char **argv) break; } - if (autosaveRequested && app.GetXuiServerAction(kServerActionPad) == eXuiServerAction_Idle && !ConsoleSaveFileOriginal::hasPendingBackgroundSave()) + if (autosaveRequested && app.GetXuiServerAction(kServerActionPad) == eXuiServerAction_Idle) { LogWorldIO("autosave completed"); autosaveRequested = false; @@ -749,7 +751,7 @@ int main(int argc, char **argv) DWORD now = GetTickCount(); if ((LONG)(now - nextAutosaveTick) >= 0) { - if (app.GetXuiServerAction(kServerActionPad) == eXuiServerAction_Idle && !ConsoleSaveFileOriginal::hasPendingBackgroundSave()) + if (app.GetXuiServerAction(kServerActionPad) == eXuiServerAction_Idle) { LogWorldIO("requesting autosave"); app.SetXuiServerAction(kServerActionPad, eXuiServerAction_AutoSaveGame); @@ -768,18 +770,16 @@ int main(int argc, char **argv) LogInfof("shutdown", "Dedicated server stopped"); MinecraftServer *server = MinecraftServer::getInstance(); - if (server != NULL && !ConsoleSaveFileOriginal::hasPendingBackgroundSave()) + if (server != NULL) + { + server->setSaveOnExit(true); + } + if (server != NULL) { - server->setSaveOnExit(true); LogWorldIO("requesting save before shutdown"); LogWorldIO("using saveOnExit for shutdown"); } - if (ConsoleSaveFileOriginal::hasPendingBackgroundSave()) - { - LogWorldIO("Waiting for autosave to complete..."); - } - MinecraftServer::HaltServer(); if (g_NetworkManager.ServerStoppedValid())