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

Fix regression in leveldb backend

master
sapier 2014-07-07 00:06:06 +02:00
parent 96f285f71e
commit e14c4cdd4c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/database-leveldb.cpp
View File

@ -100,8 +100,7 @@ MapBlock* Database_LevelDB::loadBlock(v3s16 blockpos)
std::string datastr; std::string datastr;
leveldb::Status status = m_database->Get(leveldb::ReadOptions(), leveldb::Status status = m_database->Get(leveldb::ReadOptions(),
i64tos(getBlockAsInteger(blockpos)), &datastr); i64tos(getBlockAsInteger(blockpos)), &datastr);
ENSURE_STATUS_OK(status); if (datastr.length() == 0 && status.ok()) {
if (datastr.length() == 0) {
errorstream << "Blank block data in database (datastr.length() == 0) (" errorstream << "Blank block data in database (datastr.length() == 0) ("
<< blockpos.X << "," << blockpos.Y << "," << blockpos.Z << ")" << std::endl; << blockpos.X << "," << blockpos.Y << "," << blockpos.Z << ")" << std::endl;
@ -112,7 +111,8 @@ MapBlock* Database_LevelDB::loadBlock(v3s16 blockpos)
throw SerializationError("Blank block data in database"); throw SerializationError("Blank block data in database");
} }
return NULL; return NULL;
} else { }
if (status.ok()) {
/* /*
Make sure sector is loaded Make sure sector is loaded
*/ */