summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLogicParrot <LogicParrot@users.noreply.github.com>2016-02-04 09:43:54 +0100
committerLogicParrot <LogicParrot@users.noreply.github.com>2016-02-04 09:43:54 +0100
commitc3a4373ac57dbd57385b8c79eb2dd96d15fc6266 (patch)
treecb5cc2edbfb8e364dbff575102f59f3ae44ae573
parentMerge pull request #2939 from LogicParrot/m_Target (diff)
parentFix unexpected world creation introduced by #2821 (diff)
downloadcuberite-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 '')
-rw-r--r--src/Root.cpp2
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"))