flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #2955 from LogicParrot/worldBackwards

Browse Source 
Fix unexpected world creation introduced by #2821
This commit is contained in:
LogicParrot 2016-02-04 10:43:54 +02:00
commit c3a4373ac5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Root.cpp
View File

@ -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. // Fix servers that have default world configs created prior to #2815. See #2810.
// This can probably be removed several years after 2016 // This can probably be removed several years after 2016
// We start by inspecting the world linkage and determining if it's the default one // 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>(); auto DefaultWorldIniFile= cpp14::make_unique<cIniFile>();
if (DefaultWorldIniFile->ReadFile("world/world.ini")) if (DefaultWorldIniFile->ReadFile("world/world.ini"))