aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/MinecraftServer.cpp
diff options
context:
space:
mode:
authorLoki <lokirautio@gmail.com>2026-03-04 04:06:51 -0600
committerGitHub <noreply@github.com>2026-03-04 04:06:51 -0600
commite6950a91d987a255c6d283e7c7421a20b29f7150 (patch)
tree0836426857391df1b6a83f6368a183f83ec9b104 /Minecraft.Client/MinecraftServer.cpp
parentef9b6fd500dfabd9463267b0dd9e29577eea8a2b (diff)
parent42aec6dac53dffa6afe072560a7e1d4986112538 (diff)
Merge pull request #201 from dtentiion/pr/win64-world-saves
Show actual world names in save list, sorting, preserve level and its name on load/resave
Diffstat (limited to 'Minecraft.Client/MinecraftServer.cpp')
-rw-r--r--Minecraft.Client/MinecraftServer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Minecraft.Client/MinecraftServer.cpp b/Minecraft.Client/MinecraftServer.cpp
index 974c7405..a81bce59 100644
--- a/Minecraft.Client/MinecraftServer.cpp
+++ b/Minecraft.Client/MinecraftServer.cpp
@@ -613,7 +613,7 @@ bool MinecraftServer::initServer(__int64 seed, NetworkGameInitData *initData, DW
//localIp = settings->getString(L"server-ip", L"");
//onlineMode = settings->getBoolean(L"online-mode", true);
//motd = settings->getString(L"motd", L"A Minecraft Server");
- //motd.replace('§', '$');
+ //motd.replace('�', '$');
setAnimals(settings->getBoolean(L"spawn-animals", true));
setNpcsEnabled(settings->getBoolean(L"spawn-npcs", true));
@@ -667,8 +667,8 @@ bool MinecraftServer::initServer(__int64 seed, NetworkGameInitData *initData, DW
__int64 levelNanoTime = System::nanoTime();
- wstring levelName = settings->getString(L"level-name", L"world");
- wstring levelTypeString;
+ wstring levelName = (initData && !initData->levelName.empty()) ? initData->levelName : settings->getString(L"level-name", L"world");
+ wstring levelTypeString;
bool gameRuleUseFlatWorld = false;
if(app.getLevelGenerationOptions() != NULL)