mirror of
https://github.com/minetest/minetest.git
synced 2024-09-12 00:26:50 +02:00
added ignoring of map_meta.txt to better support old maps
This commit is contained in:
parent
4934f3d060
commit
dc6966cb9d
12
src/map.cpp
12
src/map.cpp
@ -1834,16 +1834,16 @@ ServerMap::ServerMap(std::string savedir):
|
||||
}
|
||||
else
|
||||
{
|
||||
// Load map metadata (seed, chunksize)
|
||||
loadMapMeta();
|
||||
|
||||
try{
|
||||
// Load map metadata (seed, chunksize)
|
||||
loadMapMeta();
|
||||
|
||||
// Load chunk metadata
|
||||
loadChunkMeta();
|
||||
}
|
||||
catch(FileNotGoodException &e){
|
||||
dstream<<DTIME<<"WARNING: Server: Could not load "
|
||||
<<"chunk metafile. Disabling chunk-based "
|
||||
<<"metafile(s). Disabling chunk-based "
|
||||
<<"generation."<<std::endl;
|
||||
m_chunksize = 0;
|
||||
}
|
||||
@ -4967,7 +4967,7 @@ void ServerMap::loadMapMeta()
|
||||
{
|
||||
DSTACK(__FUNCTION_NAME);
|
||||
|
||||
dstream<<"INFO: ServerMap::loadMapMeta(): Loading chunk metadata"
|
||||
dstream<<"INFO: ServerMap::loadMapMeta(): Loading map metadata"
|
||||
<<std::endl;
|
||||
|
||||
std::string fullpath = m_savedir + "/map_meta.txt";
|
||||
@ -4976,7 +4976,7 @@ void ServerMap::loadMapMeta()
|
||||
{
|
||||
dstream<<"ERROR: ServerMap::loadMapMeta(): "
|
||||
<<"could not open"<<fullpath<<std::endl;
|
||||
throw FileNotGoodException("Cannot open chunk metadata");
|
||||
throw FileNotGoodException("Cannot open map metadata");
|
||||
}
|
||||
|
||||
Settings params;
|
||||
|
Loading…
Reference in New Issue
Block a user