summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-01-10 16:33:53 +0100
committermadmaxoft <github@xoft.cz>2014-01-10 16:34:09 +0100
commit712e6e0bb2ef2accf4ffc7792c1ad0ab0ae96662 (patch)
treebfb7ce25b8150adb210cd900d038423fd0184a9d
parentMerge pull request #520 from mc-server/SoulSand (diff)
downloadcuberite-712e6e0bb2ef2accf4ffc7792c1ad0ab0ae96662.tar
cuberite-712e6e0bb2ef2accf4ffc7792c1ad0ab0ae96662.tar.gz
cuberite-712e6e0bb2ef2accf4ffc7792c1ad0ab0ae96662.tar.bz2
cuberite-712e6e0bb2ef2accf4ffc7792c1ad0ab0ae96662.tar.lz
cuberite-712e6e0bb2ef2accf4ffc7792c1ad0ab0ae96662.tar.xz
cuberite-712e6e0bb2ef2accf4ffc7792c1ad0ab0ae96662.tar.zst
cuberite-712e6e0bb2ef2accf4ffc7792c1ad0ab0ae96662.zip
-rw-r--r--src/Generating/ComposableGenerator.cpp3
-rw-r--r--src/Generating/HeiGen.cpp1
2 files changed, 3 insertions, 1 deletions
diff --git a/src/Generating/ComposableGenerator.cpp b/src/Generating/ComposableGenerator.cpp
index 76d06724d..971ff4538 100644
--- a/src/Generating/ComposableGenerator.cpp
+++ b/src/Generating/ComposableGenerator.cpp
@@ -90,7 +90,8 @@ cTerrainCompositionGen * cTerrainCompositionGen::CreateCompositionGen(cIniFile &
}
else
{
- LOGWARN("Unknown CompositionGen \"%s\", using \"biomal\" instead.", CompoGenName.c_str());
+ LOGWARN("Unknown CompositionGen \"%s\", using \"Biomal\" instead.", CompoGenName.c_str());
+ a_IniFile.DeleteValue("Generator", "CompositionGen");
a_IniFile.SetValue("Generator", "CompositionGen", "Biomal");
return CreateCompositionGen(a_IniFile, a_BiomeGen, a_HeightGen, a_Seed);
}
diff --git a/src/Generating/HeiGen.cpp b/src/Generating/HeiGen.cpp
index 051758f71..10710b4a1 100644
--- a/src/Generating/HeiGen.cpp
+++ b/src/Generating/HeiGen.cpp
@@ -72,6 +72,7 @@ cTerrainHeightGen * cTerrainHeightGen::CreateHeightGen(cIniFile &a_IniFile, cBio
{
// No match found, force-set the default and retry
LOGWARN("Unknown HeightGen \"%s\", using \"Biomal\" instead.", HeightGenName.c_str());
+ a_IniFile.DeleteValue("Generator", "HeightGen");
a_IniFile.SetValue("Generator", "HeightGen", "Biomal");
return CreateHeightGen(a_IniFile, a_BiomeGen, a_Seed, a_CacheOffByDefault);
}