Add /clearobjects

[minetest.git] / src / environment.cpp

diff --git a/src/environment.cpp b/src/environment.cpp
index 1319e37444d40ec7480dff434634776638a27834..14227184962cfd91ca0157e4074080c86a89367d 100644 (file)
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -647,6 +647,92 @@ void ServerEnvironment::activateBlock(MapBlock *block, u32 additional_dtime)
        }
 }
 
+void ServerEnvironment::clearAllObjects()
+{
+       infostream<<"ServerEnvironment::clearAllObjects(): "
+                       <<"Removing all active objects"<<std::endl;
+       core::list<u16> objects_to_remove;
+       for(core::map<u16, ServerActiveObject*>::Iterator
+                       i = m_active_objects.getIterator();
+                       i.atEnd()==false; i++)
+       {
+               ServerActiveObject* obj = i.getNode()->getValue();
+               u16 id = i.getNode()->getKey();         
+               v3f objectpos = obj->getBasePosition(); 
+               // Delete static object if block is loaded
+               if(obj->m_static_exists){
+                       MapBlock *block = m_map->getBlockNoCreateNoEx(obj->m_static_block);
+                       if(block){
+                               block->m_static_objects.remove(id);
+                               block->raiseModified(MOD_STATE_WRITE_NEEDED);
+                               obj->m_static_exists = false;
+                       }
+               }
+               // If known by some client, don't delete immediately
+               if(obj->m_known_by_count > 0){
+                       obj->m_pending_deactivation = true;
+                       obj->m_removed = true;
+                       continue;
+               }
+               // Delete active object
+               delete obj;
+               // Id to be removed from m_active_objects
+               objects_to_remove.push_back(id);
+       }
+       // Remove references from m_active_objects
+       for(core::list<u16>::Iterator i = objects_to_remove.begin();
+                       i != objects_to_remove.end(); i++)
+       {
+               m_active_objects.remove(*i);
+       }
+
+       core::list<v3s16> loadable_blocks;
+       infostream<<"ServerEnvironment::clearAllObjects(): "
+                       <<"Listing all loadable blocks"<<std::endl;
+       m_map->listAllLoadableBlocks(loadable_blocks);
+       infostream<<"ServerEnvironment::clearAllObjects(): "
+                       <<"Done listing all loadable blocks: "
+                       <<loadable_blocks.size()
+                       <<", now clearing"<<std::endl;
+       u32 report_interval = loadable_blocks.size() / 10;
+       u32 num_blocks_checked = 0;
+       u32 num_blocks_cleared = 0;
+       u32 num_objs_cleared = 0;
+       for(core::list<v3s16>::Iterator i = loadable_blocks.begin();
+                       i != loadable_blocks.end(); i++)
+       {
+               v3s16 p = *i;
+               MapBlock *block = m_map->emergeBlock(p, false);
+               if(!block){
+                       errorstream<<"ServerEnvironment::clearAllObjects(): "
+                                       <<"Failed to emerge block "<<PP(p)<<std::endl;
+                       continue;
+               }
+               u32 num_stored = block->m_static_objects.m_stored.size();
+               u32 num_active = block->m_static_objects.m_active.size();
+               if(num_stored != 0 || num_active != 0){
+                       block->m_static_objects.m_stored.clear();
+                       block->m_static_objects.m_active.clear();
+                       block->raiseModified(MOD_STATE_WRITE_NEEDED);
+                       num_objs_cleared += num_stored + num_active;
+                       num_blocks_cleared++;
+               }
+               num_blocks_checked++;
+
+               if(num_blocks_checked % report_interval == 0){
+                       float percent = 100.0 * (float)num_blocks_checked /
+                                       loadable_blocks.size();
+                       infostream<<"ServerEnvironment::clearAllObjects(): "
+                                       <<"Cleared "<<num_objs_cleared<<" objects"
+                                       <<" in "<<num_blocks_cleared<<" blocks ("
+                                       <<percent<<"%)"<<std::endl;
+               }
+       }
+       infostream<<"ServerEnvironment::clearAllObjects(): "
+                       <<"Finished: Cleared "<<num_objs_cleared<<" objects"
+                       <<" in "<<num_blocks_cleared<<" blocks"<<std::endl;
+}
+
 static void getMob_dungeon_master(Settings &properties)
 {
        properties.set("looks", "dungeon_master");
@@ -887,9 +973,10 @@ void ServerEnvironment::step(float dtime)
                                if(block==NULL)
                                        continue;
                                active_object_count_wider +=
-                                               block->m_static_objects.m_active.size();
+                                               block->m_static_objects.m_active.size()
+                                               + block->m_static_objects.m_stored.size();
                                
-                               if(block->m_static_objects.m_stored.size() != 0){
+                               /*if(block->m_static_objects.m_stored.size() != 0){
                                        errorstream<<"ServerEnvironment::step(): "
                                                        <<PP(block->getPos())<<" contains "
                                                        <<block->m_static_objects.m_stored.size()
@@ -897,7 +984,7 @@ void ServerEnvironment::step(float dtime)
                                                        <<"when spawning objects, when counting active "
                                                        <<"objects in wide area. relative position: "
                                                        <<"("<<x<<","<<y<<","<<z<<")"<<std::endl;
-                               }
+                               }*/
                        }
 
                        v3s16 p0;
@@ -1518,12 +1605,15 @@ void ServerEnvironment::activateObjects(MapBlock *block)
                        <<"activating objects of block "<<PP(block->getPos())
                        <<" ("<<block->m_static_objects.m_stored.size()
                        <<" objects)"<<std::endl;
-       bool large_amount = (block->m_static_objects.m_stored.size() >= 51);
+       bool large_amount = (block->m_static_objects.m_stored.size() > 49);
        if(large_amount){
                errorstream<<"suspiciously large amount of objects detected: "
                                <<block->m_static_objects.m_stored.size()<<" in "
                                <<PP(block->getPos())
-                               <<"; not activating."<<std::endl;
+                               <<"; removing all of them."<<std::endl;
+               // Clear stored list
+               block->m_static_objects.m_stored.clear();
+               block->raiseModified(MOD_STATE_WRITE_NEEDED);
                return;
        }
        // A list for objects that couldn't be converted to static for some
@@ -1645,10 +1735,12 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete)
 
                if(block)
                {
-                       if(block->m_static_objects.m_stored.size() >= 50){
+                       if(block->m_static_objects.m_stored.size() >= 49){
                                errorstream<<"ServerEnv: Trying to store id="<<obj->getId()
                                                <<" statically but block "<<PP(blockpos)
-                                               <<" already contains over 50 objects."
+                                               <<" already contains "
+                                               <<block->m_static_objects.m_stored.size()
+                                               <<" (over 49) objects."
                                                <<" Forcing delete."<<std::endl;
                                force_delete = true;
                        } else {