Don't re-write entire map_meta.txt if a setting is missing
parent
046534e14b
commit
453d79e3a2
12
src/map.cpp
12
src/map.cpp
|
@ -3466,8 +3466,16 @@ void ServerMap::loadMapMeta()
|
||||||
break;
|
break;
|
||||||
params.parseConfigLine(line);
|
params.parseConfigLine(line);
|
||||||
}
|
}
|
||||||
|
|
||||||
MapgenParams *mgparams = m_emerge->getParamsFromSettings(¶ms);
|
MapgenParams *mgparams;
|
||||||
|
try {
|
||||||
|
mgparams = m_emerge->getParamsFromSettings(¶ms);
|
||||||
|
} catch (SettingNotFoundException &e) {
|
||||||
|
infostream << "Couldn't get a setting from map_meta.txt: "
|
||||||
|
<< e.what() << std::endl;
|
||||||
|
mgparams = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
if (mgparams) {
|
if (mgparams) {
|
||||||
if (m_mgparams)
|
if (m_mgparams)
|
||||||
delete m_mgparams;
|
delete m_mgparams;
|
||||||
|
|
Loading…
Reference in New Issue