MultiCraft
/
MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added ignoring of map_meta.txt to better support old maps

master
Perttu Ahola 2011-04-11 00:06:07 +03:00
parent 4934f3d060
commit dc6966cb9d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/map.cpp
View File

@ -1834,16 +1834,16 @@ ServerMap::ServerMap(std::string savedir):
} }
else else
{ {
// Load map metadata (seed, chunksize)
loadMapMeta();
try{ try{
// Load map metadata (seed, chunksize)
loadMapMeta();
// Load chunk metadata // Load chunk metadata
loadChunkMeta(); loadChunkMeta();
} }
catch(FileNotGoodException &e){ catch(FileNotGoodException &e){
dstream<<DTIME<<"WARNING: Server: Could not load " dstream<<DTIME<<"WARNING: Server: Could not load "
<<"chunk metafile. Disabling chunk-based " <<"metafile(s). Disabling chunk-based "
<<"generation."<<std::endl; <<"generation."<<std::endl;
m_chunksize = 0; m_chunksize = 0;
} }
@ -4967,7 +4967,7 @@ void ServerMap::loadMapMeta()
{ {
DSTACK(__FUNCTION_NAME); DSTACK(__FUNCTION_NAME);
dstream<<"INFO: ServerMap::loadMapMeta(): Loading chunk metadata" dstream<<"INFO: ServerMap::loadMapMeta(): Loading map metadata"
<<std::endl; <<std::endl;
std::string fullpath = m_savedir + "/map_meta.txt"; std::string fullpath = m_savedir + "/map_meta.txt";
@ -4976,7 +4976,7 @@ void ServerMap::loadMapMeta()
{ {
dstream<<"ERROR: ServerMap::loadMapMeta(): " dstream<<"ERROR: ServerMap::loadMapMeta(): "
<<"could not open"<<fullpath<<std::endl; <<"could not open"<<fullpath<<std::endl;
throw FileNotGoodException("Cannot open chunk metadata"); throw FileNotGoodException("Cannot open map metadata");
} }
Settings params; Settings params;