summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLogicParrot <LogicParrot@users.noreply.github.com>2016-02-09 09:16:29 +0100
committerLogicParrot <LogicParrot@users.noreply.github.com>2016-02-09 09:16:29 +0100
commit6504ce0c84ca90e55cc8faa2fadf40ba03fdaa26 (patch)
treeb6368834c321b02aea35bd1077863a54f31bc0a6 /src
parentMerge pull request #2995 from LogicParrot/message (diff)
parentWrite to console when autofixing linkages (diff)
downloadcuberite-6504ce0c84ca90e55cc8faa2fadf40ba03fdaa26.tar
cuberite-6504ce0c84ca90e55cc8faa2fadf40ba03fdaa26.tar.gz
cuberite-6504ce0c84ca90e55cc8faa2fadf40ba03fdaa26.tar.bz2
cuberite-6504ce0c84ca90e55cc8faa2fadf40ba03fdaa26.tar.lz
cuberite-6504ce0c84ca90e55cc8faa2fadf40ba03fdaa26.tar.xz
cuberite-6504ce0c84ca90e55cc8faa2fadf40ba03fdaa26.tar.zst
cuberite-6504ce0c84ca90e55cc8faa2fadf40ba03fdaa26.zip
Diffstat (limited to '')
-rw-r--r--src/Root.cpp1
-rw-r--r--src/World.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/Root.cpp b/src/Root.cpp
index 11cc4e250..87c255b9c 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -410,6 +410,7 @@ void cRoot::LoadWorlds(cSettingsRepositoryInterface & a_Settings, bool a_IsNewIn
a_Settings.AddValue("Worlds", "World", "world_nether");
a_Settings.AddValue("Worlds", "World", "world_end");
Worlds = a_Settings.GetValues("Worlds"); // Refresh the Worlds list so that the rest of the function works as usual
+ LOG("The server detected an old default config with bad world linkages. This has been autofixed by adding \"world_nether\" and \"world_end\" to settings.ini");
}
}
}
diff --git a/src/World.cpp b/src/World.cpp
index 3bfb7c730..c704b46bb 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -558,7 +558,7 @@ void cWorld::Start(void)
if (!BadWorlds.empty())
{
const char * WorldName = m_WorldName.c_str();
- LOGERROR("\n###### ERROR: %s is linked to the following nonexisting world/s:\n%s\n\nPlease edit %s/world.ini and fix this.\n\nNote that the server started enforcing proper world linkages recently. And people with older configs may naturally get this error. If you just want a working default config and don't mind losing this world, delete the folder \"%s\" and the server will receate one for you. Otherwise edit the world.ini file and fix the invalid linkages.\n######\n",
+ LOGERROR("\n###### ERROR: \"%s\" is linked to the following nonexisting world/s:\n%s\n\nPlease edit %s/world.ini and fix this.\n\nNote that the server started enforcing proper world linkages recently. And people with older configs may naturally get this error. If you just want a working default config and don't mind losing this world, delete the folder \"%s\" and the server will receate one for you. Otherwise edit the world.ini file and fix the invalid linkages.\n\nMore help and info:\nhttps://forum.cuberite.org/thread-2366.html\n######\n",
WorldName, BadWorlds.c_str(), WorldName, WorldName);
cRoot::Get()->StopServer();
}