oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Safely handle block deletion (#13315)

Browse source 
Co-authored-by: Jude Melton-Houghton <jwmhjwmh@gmail.com>
This commit is contained in:
DS 2023-03-24 12:34:44 +01:00 • committed by GitHub
parent f3b198e490
commit ed632f3854
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 74 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/map.cpp
View file

@ -1309,6 +1309,8 @@ ServerMap::~ServerMap()
*/
delete dbase;
delete dbase_ro;
deleteDetachedBlocks();
}
MapgenParams *ServerMap::getMapgenParams()
@ -1888,12 +1890,31 @@ bool ServerMap::deleteBlock(v3s16 blockpos)
MapSector *sector = getSectorNoGenerate(p2d);
if (!sector)
return false;
sector->deleteBlock(block);
// It may not be safe to delete the block from memory at the moment
// (pointers to it could still be in use)
sector->detachBlock(block);
m_detached_blocks.push_back(block);
}
return true;
}
void ServerMap::deleteDetachedBlocks()
{
for (MapBlock *block : m_detached_blocks) {
assert(block->isOrphan());
delete block;
}
m_detached_blocks.clear();
}
void ServerMap::step()
{
// Delete from memory blocks removed by deleteBlocks() only when pointers
// to them are (probably) no longer in use
deleteDetachedBlocks();
}
void ServerMap::PrintInfo(std::ostream &out)
{
out<<"ServerMap: ";