summaryrefslogtreecommitdiffstats
path: root/src/World.cpp
diff options
context:
space:
mode:
authorBond-009 <Bond-009@users.noreply.github.com>2017-02-24 10:02:16 +0100
committerMattes D <github@xoft.cz>2017-02-24 10:02:16 +0100
commitca3aa4ca0682f3f798765b1ee172346ba2209537 (patch)
tree81ef2a19c22fcacdaaffa34cc879d28c49db3760 /src/World.cpp
parentFinishers now update the heightmap for tall flowers. (#3545) (diff)
downloadcuberite-ca3aa4ca0682f3f798765b1ee172346ba2209537.tar
cuberite-ca3aa4ca0682f3f798765b1ee172346ba2209537.tar.gz
cuberite-ca3aa4ca0682f3f798765b1ee172346ba2209537.tar.bz2
cuberite-ca3aa4ca0682f3f798765b1ee172346ba2209537.tar.lz
cuberite-ca3aa4ca0682f3f798765b1ee172346ba2209537.tar.xz
cuberite-ca3aa4ca0682f3f798765b1ee172346ba2209537.tar.zst
cuberite-ca3aa4ca0682f3f798765b1ee172346ba2209537.zip
Diffstat (limited to 'src/World.cpp')
-rw-r--r--src/World.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/World.cpp b/src/World.cpp
index b07bc5468..7c16ae980 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -501,15 +501,20 @@ void cWorld::Start(cDeadlockDetect & a_DeadlockDetect)
if (GetDimension() == dimOverworld)
{
AString MyNetherName = GetName() + "_nether";
- AString MyEndName = GetName() + "_end";
+ AString MyEndName = GetName() + "_the_end";
if (cRoot::Get()->GetWorld(MyNetherName) == nullptr)
{
MyNetherName = "";
}
if (cRoot::Get()->GetWorld(MyEndName) == nullptr)
{
- MyEndName = "";
+ MyEndName = GetName() + "_end";
+ if (cRoot::Get()->GetWorld(MyEndName) == nullptr)
+ {
+ MyEndName = "";
+ }
}
+
m_LinkedNetherWorldName = IniFile.GetValueSet("LinkedWorlds", "NetherWorldName", MyNetherName);
m_LinkedEndWorldName = IniFile.GetValueSet("LinkedWorlds", "EndWorldName", MyEndName);
}