Translated using Weblate (Russian)

[oweals/minetest.git] / src / environment.cpp

diff --git a/src/environment.cpp b/src/environment.cpp
index 020d2b43377f7c80ef27b52aa720a485d7c4866e..51255b91847113885e552db5febe0a9a07a167f5 100644 (file)
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -804,7 +804,8 @@ void ServerEnvironment::activateBlock(MapBlock *block, u32 additional_dtime)
                                i = elapsed_timers.begin();
                                i != elapsed_timers.end(); i++){
                        n = block->getNodeNoEx(i->first);
-                       if(scriptapi_node_on_timer(m_lua,i->first,n,i->second.elapsed))
+                       v3s16 p = i->first + block->getPosRelative();
+                       if(scriptapi_node_on_timer(m_lua,p,n,i->second.elapsed))
                                block->setNodeTimer(i->first,NodeTimer(i->second.timeout,0));
                }
        }
@@ -1300,6 +1301,7 @@ u16 ServerEnvironment::addActiveObject(ServerActiveObject *object)
        return id;
 }
 
+#if 0
 bool ServerEnvironment::addActiveObjectAsStatic(ServerActiveObject *obj)
 {
        assert(obj);
@@ -1342,6 +1344,7 @@ bool ServerEnvironment::addActiveObjectAsStatic(ServerActiveObject *obj)
 
        return succeeded;
 }
+#endif
 
 /*
        Finds out what new objects have been added to
@@ -1562,13 +1565,15 @@ void ServerEnvironment::removeRemovedObjects()
                */
                if(obj->m_static_exists && obj->m_removed)
                {
-                       MapBlock *block = m_map->emergeBlock(obj->m_static_block);
-                       if(block)
-                       {
+                       MapBlock *block = m_map->emergeBlock(obj->m_static_block, false);
+                       if (block) {
                                block->m_static_objects.remove(id);
                                block->raiseModified(MOD_STATE_WRITE_NEEDED,
                                                "removeRemovedObjects");
                                obj->m_static_exists = false;
+                       } else {
+                               infostream << "failed to emerge block from which "
+                                       "an object to be removed was loaded from. id="<<id<<std::endl;
                        }
                }
 
@@ -1716,6 +1721,8 @@ void ServerEnvironment::activateObjects(MapBlock *block, u32 dtime_s)
 
        If force_delete is set, active object is deleted nevertheless. It
        shall only be set so in the destructor of the environment.
+
+       If block wasn't generated (not in memory or on disk), 
 */
 void ServerEnvironment::deactivateFarObjects(bool force_delete)
 {