diff options
| -rw-r--r-- | src/database-leveldb.cpp | 131 | ||||
| -rw-r--r-- | src/database-sqlite3.cpp | 4 |
2 files changed, 74 insertions, 61 deletions
diff --git a/src/database-leveldb.cpp b/src/database-leveldb.cpp index 8f8d18290..ec28198b5 100644 --- a/src/database-leveldb.cpp +++ b/src/database-leveldb.cpp @@ -92,68 +92,81 @@ MapBlock* Database_LevelDB::loadBlock(v3s16 blockpos) v2s16 p2d(blockpos.X, blockpos.Z); std::string datastr; - leveldb::Status s = m_database->Get(leveldb::ReadOptions(), i64tos(getBlockAsInteger(blockpos)), &datastr); + leveldb::Status s = m_database->Get(leveldb::ReadOptions(), + i64tos(getBlockAsInteger(blockpos)), &datastr); + if (datastr.length() == 0) { + errorstream << "Blank block data in database (datastr.length() == 0) (" + << blockpos.X << "," << blockpos.Y << "," << blockpos.Z << ")" << std::endl; + + if (g_settings->getBool("ignore_world_load_errors")) { + errorstream << "Ignoring block load error. Duck and cover! " + << "(ignore_world_load_errors)" << std::endl; + } else { + throw SerializationError("Blank block data in database"); + } + } - if(s.ok()) { - /* - Make sure sector is loaded - */ - MapSector *sector = srvmap->createSector(p2d); + if (s.ok()) { + /* + Make sure sector is loaded + */ + MapSector *sector = srvmap->createSector(p2d); try { - std::istringstream is(datastr, std::ios_base::binary); - u8 version = SER_FMT_VER_INVALID; - is.read((char*)&version, 1); - - if(is.fail()) - throw SerializationError("ServerMap::loadBlock(): Failed" - " to read MapBlock version"); - - MapBlock *block = NULL; - bool created_new = false; - block = sector->getBlockNoCreateNoEx(blockpos.Y); - if(block == NULL) - { - block = sector->createBlankBlockNoInsert(blockpos.Y); - created_new = true; - } - // Read basic data - block->deSerialize(is, version, true); - // If it's a new block, insert it to the map - if(created_new) - sector->insertBlock(block); - /* - Save blocks loaded in old format in new format - */ - - //if(version < SER_FMT_VER_HIGHEST || save_after_load) - // Only save if asked to; no need to update version - //if(save_after_load) - // saveBlock(block); - // We just loaded it from, so it's up-to-date. - block->resetModified(); - - } - catch(SerializationError &e) - { - errorstream<<"Invalid block data in database" - <<" ("<<blockpos.X<<","<<blockpos.Y<<","<<blockpos.Z<<")" - <<" (SerializationError): "<<e.what()<<std::endl; - // TODO: Block should be marked as invalid in memory so that it is - // not touched but the game can run - - if(g_settings->getBool("ignore_world_load_errors")){ - errorstream<<"Ignoring block load error. Duck and cover! " - <<"(ignore_world_load_errors)"<<std::endl; - } else { - throw SerializationError("Invalid block data in database"); - //assert(0); - } - } - - return srvmap->getBlockNoCreateNoEx(blockpos); // should not be using this here - } - return(NULL); + std::istringstream is(datastr, std::ios_base::binary); + u8 version = SER_FMT_VER_INVALID; + is.read((char *)&version, 1); + + if (is.fail()) + throw SerializationError("ServerMap::loadBlock(): Failed" + " to read MapBlock version"); + + MapBlock *block = NULL; + bool created_new = false; + block = sector->getBlockNoCreateNoEx(blockpos.Y); + if (block == NULL) + { + block = sector->createBlankBlockNoInsert(blockpos.Y); + created_new = true; + } + + // Read basic data + block->deSerialize(is, version, true); + + // If it's a new block, insert it to the map + if (created_new) + sector->insertBlock(block); + + /* + Save blocks loaded in old format in new format + */ + //if(version < SER_FMT_VER_HIGHEST || save_after_load) + // Only save if asked to; no need to update version + //if(save_after_load) + // saveBlock(block); + // We just loaded it from, so it's up-to-date. + block->resetModified(); + } + catch (SerializationError &e) + { + errorstream << "Invalid block data in database" + << " (" << blockpos.X << "," << blockpos.Y << "," << blockpos.Z + << ") (SerializationError): " << e.what() << std::endl; + // TODO: Block should be marked as invalid in memory so that it is + // not touched but the game can run + + if (g_settings->getBool("ignore_world_load_errors")) { + errorstream << "Ignoring block load error. Duck and cover! " + << "(ignore_world_load_errors)" << std::endl; + } else { + throw SerializationError("Invalid block data in database"); + //assert(0); + } + } + + return srvmap->getBlockNoCreateNoEx(blockpos); // should not be using this here + } + return NULL; } void Database_LevelDB::listAllLoadableBlocks(std::list<v3s16> &dst) diff --git a/src/database-sqlite3.cpp b/src/database-sqlite3.cpp index b86f0806f..44eb86f54 100644 --- a/src/database-sqlite3.cpp +++ b/src/database-sqlite3.cpp @@ -247,7 +247,7 @@ MapBlock* Database_SQLite3::loadBlock(v3s16 blockpos) std::istringstream is(datastr, std::ios_base::binary); u8 version = SER_FMT_VER_INVALID; - is.read((char*)&version, 1); + is.read((char *)&version, 1); if (is.fail()) throw SerializationError("ServerMap::loadBlock(): Failed" @@ -280,7 +280,7 @@ MapBlock* Database_SQLite3::loadBlock(v3s16 blockpos) // We just loaded it from, so it's up-to-date. block->resetModified(); } - catch(SerializationError &e) + catch (SerializationError &e) { errorstream << "Invalid block data in database" << " (" << blockpos.X << "," << blockpos.Y << "," << blockpos.Z << ")" |