Initial Commit

[dragonfireclient.git] / src / serverenvironment.cpp

diff --git a/src/serverenvironment.cpp b/src/serverenvironment.cpp
index 3c473313049fcb930cb35375395d1f15b8ef826b..333d32ff540d7d0414e1f61e862d620b44d30872 100644 (file)
--- a/src/serverenvironment.cpp
+++ b/src/serverenvironment.cpp
@@ -550,7 +550,7 @@ bool ServerEnvironment::line_of_sight(v3f pos1, v3f pos2, v3s16 *p)
        // Iterate trough nodes on the line
        voxalgo::VoxelLineIterator iterator(pos1 / BS, (pos2 - pos1) / BS);
        do {
-               MapNode n = getMap().getNodeNoEx(iterator.m_current_node_pos);
+               MapNode n = getMap().getNode(iterator.m_current_node_pos);
 
                // Return non-air
                if (n.param0 != CONTENT_AIR) {
@@ -914,7 +914,7 @@ class ABMHandler
                                                        c = n.getContent();
                                                } else {
                                                        // otherwise consult the map
-                                                       MapNode n = map->getNodeNoEx(p1 + block->getPosRelative());
+                                                       MapNode n = map->getNode(p1 + block->getPosRelative());
                                                        c = n.getContent();
                                                }
                                                if (CONTAINS(aabm.required_neighbors, c))
@@ -1008,7 +1008,7 @@ void ServerEnvironment::addLoadingBlockModifierDef(LoadingBlockModifierDef *lbm)
 bool ServerEnvironment::setNode(v3s16 p, const MapNode &n)
 {
        const NodeDefManager *ndef = m_server->ndef();
-       MapNode n_old = m_map->getNodeNoEx(p);
+       MapNode n_old = m_map->getNode(p);
 
        const ContentFeatures &cf_old = ndef->get(n_old);
 
@@ -1041,7 +1041,7 @@ bool ServerEnvironment::setNode(v3s16 p, const MapNode &n)
 bool ServerEnvironment::removeNode(v3s16 p)
 {
        const NodeDefManager *ndef = m_server->ndef();
-       MapNode n_old = m_map->getNodeNoEx(p);
+       MapNode n_old = m_map->getNode(p);
 
        // Call destructor
        if (ndef->get(n_old).has_on_destruct)
@@ -1200,6 +1200,7 @@ void ServerEnvironment::clearObjects(ClearObjectsMode mode)
 
 void ServerEnvironment::step(float dtime)
 {
+       ScopeProfiler sp2(g_profiler, "ServerEnv::step()", SPT_AVG);
        /* Step time of day */
        stepTimeOfDay(dtime);
 
@@ -1224,7 +1225,7 @@ void ServerEnvironment::step(float dtime)
                Handle players
        */
        {
-               ScopeProfiler sp(g_profiler, "SEnv: handle players avg", SPT_AVG);
+               ScopeProfiler sp(g_profiler, "ServerEnv: move players", SPT_AVG);
                for (RemotePlayer *player : m_players) {
                        // Ignore disconnected players
                        if (player->getPeerId() == PEER_ID_INEXISTENT)
@@ -1239,7 +1240,7 @@ void ServerEnvironment::step(float dtime)
                Manage active block list
        */
        if (m_active_blocks_management_interval.step(dtime, m_cache_active_block_mgmt_interval)) {
-               ScopeProfiler sp(g_profiler, "SEnv: manage act. block list avg per interval", SPT_AVG);
+               ScopeProfiler sp(g_profiler, "ServerEnv: update active blocks", SPT_AVG);
                /*
                        Get player block positions
                */
@@ -1305,7 +1306,7 @@ void ServerEnvironment::step(float dtime)
                Mess around in active blocks
        */
        if (m_active_blocks_nodemetadata_interval.step(dtime, m_cache_nodetimer_interval)) {
-               ScopeProfiler sp(g_profiler, "SEnv: mess in act. blocks avg per interval", SPT_AVG);
+               ScopeProfiler sp(g_profiler, "ServerEnv: Run node timers", SPT_AVG);
 
                float dtime = m_cache_nodetimer_interval;
 
@@ -1385,10 +1386,10 @@ void ServerEnvironment::step(float dtime)
                                break;
                        }
                }
-               g_profiler->avg("SEnv: active blocks", m_active_blocks.m_abm_list.size());
-               g_profiler->avg("SEnv: active blocks cached", blocks_cached);
-               g_profiler->avg("SEnv: active blocks scanned for ABMs", blocks_scanned);
-               g_profiler->avg("SEnv: ABMs run", abms_run);
+               g_profiler->avg("ServerEnv: active blocks", m_active_blocks.m_abm_list.size());
+               g_profiler->avg("ServerEnv: active blocks cached", blocks_cached);
+               g_profiler->avg("ServerEnv: active blocks scanned for ABMs", blocks_scanned);
+               g_profiler->avg("ServerEnv: ABMs run", abms_run);
 
                timer.stop(true);
        }
@@ -1402,7 +1403,7 @@ void ServerEnvironment::step(float dtime)
                Step active objects
        */
        {
-               ScopeProfiler sp(g_profiler, "SEnv: step act. objs avg", SPT_AVG);
+               ScopeProfiler sp(g_profiler, "ServerEnv: Run SAO::step()", SPT_AVG);
 
                // This helps the objects to send data at the same time
                bool send_recommended = false;
@@ -1431,7 +1432,6 @@ void ServerEnvironment::step(float dtime)
                Manage active objects
        */
        if (m_object_management_interval.step(dtime, 0.5)) {
-               ScopeProfiler sp(g_profiler, "SEnv: remove removed objs avg /.5s", SPT_AVG);
                removeRemovedObjects();
        }
 
@@ -1454,6 +1454,19 @@ void ServerEnvironment::step(float dtime)
                                ++i;
                }
        }
+
+       // Send outdated player inventories
+       for (RemotePlayer *player : m_players) {
+               if (player->getPeerId() == PEER_ID_INEXISTENT)
+                       continue;
+
+               PlayerSAO *sao = player->getPlayerSAO();
+               if (sao && player->inventory.checkModified())
+                       m_server->SendInventory(sao, true);
+       }
+
+       // Send outdated detached inventories
+       m_server->sendDetachedInventories(PEER_ID_INEXISTENT, true);
 }
 
 u32 ServerEnvironment::addParticleSpawner(float exptime)
@@ -1686,6 +1699,8 @@ u16 ServerEnvironment::addActiveObjectRaw(ServerActiveObject *object,
 */
 void ServerEnvironment::removeRemovedObjects()
 {
+       ScopeProfiler sp(g_profiler, "ServerEnvironment::removeRemovedObjects()", SPT_AVG);
+
        auto clear_cb = [this] (ServerActiveObject *obj, u16 id) {
                // This shouldn't happen but check it
                if (!obj) {