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

Attempt to fix objects getting multiplicated by objects getting deactivated in a different block than where they were loaded and then the original block, from where the static object was removed, not getting saved at unload

master
Perttu Ahola 2011-10-17 20:19:37 +03:00
parent c41f1c960b
commit 6661d9be1a
1 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/environment.cpp
View File

@ -1399,7 +1399,7 @@ u16 ServerEnvironment::addActiveObjectRaw(ServerActiveObject *object,
object->m_static_block = blockpos; object->m_static_block = blockpos;
if(set_changed) if(set_changed)
block->setChangedFlag(); block->raiseModified(MOD_STATE_WRITE_NEEDED);
} }
else{ else{
errorstream<<"ServerEnvironment::addActiveObjectRaw(): " errorstream<<"ServerEnvironment::addActiveObjectRaw(): "
@ -1444,11 +1444,12 @@ void ServerEnvironment::removeRemovedObjects()
*/ */
if(obj->m_static_exists && obj->m_removed) if(obj->m_static_exists && obj->m_removed)
{ {
MapBlock *block = m_map->getBlockNoCreateNoEx(obj->m_static_block); MapBlock *block = m_map->emergeBlock(obj->m_static_block);
if(block) if(block)
{ {
block->m_static_objects.remove(id); block->m_static_objects.remove(id);
block->setChangedFlag(); block->raiseModified(MOD_STATE_WRITE_NEEDED);
obj->m_static_exists = false;
} }
} }
@ -1556,7 +1557,6 @@ void ServerEnvironment::activateObjects(MapBlock *block)
<<" type="<<(int)s_obj.type<<std::endl; <<" type="<<(int)s_obj.type<<std::endl;
// This will also add the object to the active static list // This will also add the object to the active static list
addActiveObjectRaw(obj, false); addActiveObjectRaw(obj, false);
//u16 id = addActiveObjectRaw(obj, false);
} }
// Clear stored list // Clear stored list
block->m_static_objects.m_stored.clear(); block->m_static_objects.m_stored.clear();
@ -1568,13 +1568,18 @@ void ServerEnvironment::activateObjects(MapBlock *block)
StaticObject &s_obj = *i; StaticObject &s_obj = *i;
block->m_static_objects.m_stored.push_back(s_obj); block->m_static_objects.m_stored.push_back(s_obj);
} }
// Block has been modified /*
// NOTE: No it has not really. Save I/O here. Note: Block hasn't really been modified here.
//block->setChangedFlag(); The objects have just been activated and moved from the stored
static list to the active static list.
As such, the block is essentially the same.
Thus, do not call block->setChangedFlag().
Otherwise there would be a huge amount of unnecessary I/O.
*/
} }
/* /*
Convert objects that are not in active blocks to static. Convert objects that are not standing inside active blocks to static.
If m_known_by_count != 0, active object is not deleted, but static If m_known_by_count != 0, active object is not deleted, but static
data is still updated. data is still updated.
@ -1594,7 +1599,7 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete)
// This shouldn't happen but check it // This shouldn't happen but check it
if(obj == NULL) if(obj == NULL)
{ {
infostream<<"NULL object found in ServerEnvironment" errorstream<<"NULL object found in ServerEnvironment"
<<std::endl; <<std::endl;
assert(0); assert(0);
continue; continue;
@ -1619,18 +1624,16 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete)
*/ */
// Delete old static object // Delete old static object
MapBlock *oldblock = NULL;
if(obj->m_static_exists) if(obj->m_static_exists)
{ {
MapBlock *block = m_map->getBlockNoCreateNoEx MapBlock *block = m_map->emergeBlock(obj->m_static_block, false);
(obj->m_static_block);
if(block) if(block)
{ {
block->m_static_objects.remove(id); block->m_static_objects.remove(id);
oldblock = block; block->raiseModified(MOD_STATE_WRITE_AT_UNLOAD);
}
obj->m_static_exists = false; obj->m_static_exists = false;
} }
}
// Create new static object // Create new static object
std::string staticdata = obj->getStaticData(); std::string staticdata = obj->getStaticData();
@ -1640,17 +1643,6 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete)
// Get or generate the block // Get or generate the block
MapBlock *block = m_map->emergeBlock(blockpos); MapBlock *block = m_map->emergeBlock(blockpos);
/*MapBlock *block = m_map->getBlockNoCreateNoEx(blockpos);
if(block == NULL)
{
// Block not found. Is the old block still ok?
if(oldblock)
block = oldblock;
// Load from disk or generate
else
block = m_map->emergeBlock(blockpos);
}*/
if(block) if(block)
{ {
if(block->m_static_objects.m_stored.size() >= 50){ if(block->m_static_objects.m_stored.size() >= 50){
@ -1661,7 +1653,7 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete)
force_delete = true; force_delete = true;
} else { } else {
block->m_static_objects.insert(0, s_obj); block->m_static_objects.insert(0, s_obj);
block->setChangedFlag(); block->raiseModified(MOD_STATE_WRITE_AT_UNLOAD);
obj->m_static_exists = true; obj->m_static_exists = true;
obj->m_static_block = block->getPos(); obj->m_static_block = block->getPos();
} }