diff options
| author | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-02-04 09:43:54 +0100 |
|---|---|---|
| committer | LogicParrot <LogicParrot@users.noreply.github.com> | 2016-02-04 09:43:54 +0100 |
| commit | c3a4373ac57dbd57385b8c79eb2dd96d15fc6266 (patch) | |
| tree | cb5cc2edbfb8e364dbff575102f59f3ae44ae573 /src/Root.cpp | |
| parent | Merge pull request #2939 from LogicParrot/m_Target (diff) | |
| parent | Fix unexpected world creation introduced by #2821 (diff) | |
| download | cuberite-c3a4373ac57dbd57385b8c79eb2dd96d15fc6266.tar cuberite-c3a4373ac57dbd57385b8c79eb2dd96d15fc6266.tar.gz cuberite-c3a4373ac57dbd57385b8c79eb2dd96d15fc6266.tar.bz2 cuberite-c3a4373ac57dbd57385b8c79eb2dd96d15fc6266.tar.lz cuberite-c3a4373ac57dbd57385b8c79eb2dd96d15fc6266.tar.xz cuberite-c3a4373ac57dbd57385b8c79eb2dd96d15fc6266.tar.zst cuberite-c3a4373ac57dbd57385b8c79eb2dd96d15fc6266.zip | |
Diffstat (limited to 'src/Root.cpp')
| -rw-r--r-- | src/Root.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Root.cpp b/src/Root.cpp index aa532f88c..737d350ff 100644 --- a/src/Root.cpp +++ b/src/Root.cpp @@ -358,7 +358,7 @@ void cRoot::LoadWorlds(cSettingsRepositoryInterface & a_Settings, bool a_IsNewIn // Fix servers that have default world configs created prior to #2815. See #2810. // This can probably be removed several years after 2016 // We start by inspecting the world linkage and determining if it's the default one - if (DefaultWorldName == "world") + if ((DefaultWorldName == "world") && (Worlds.size() == 1)) { auto DefaultWorldIniFile= cpp14::make_unique<cIniFile>(); if (DefaultWorldIniFile->ReadFile("world/world.ini")) |