Merge remote-tracking branch 'origin/wip5.8.0' into wip5.8.0webport

src/client/fm_far_container.cpp

@@ -25,7 +25,8 @@ const MapNode &FarContainer::getNodeRefUnsafe(const v3pos_t &pos)
 	const auto step = getFarStep(m_client->getEnv().getClientMap().getControl(),
 			getNodeBlockPos(m_client->getEnv().getClientMap().far_blocks_last_cam_pos),
 			bpos);
-	const auto &shift = step; // + cell_size_pow;
+	//const auto &shift = step; // + cell_size_pow;
+	//const v3bpos_t bpos_aligned((bpos.X >> shift) << shift, (bpos.Y >> shift) << shift, (bpos.Z >> shift) << shift);
 	const v3bpos_t bpos_aligned = getFarActual(bpos,
 			getNodeBlockPos(m_client->getEnv().getClientMap().far_blocks_last_cam_pos),
 			step, m_client->getEnv().getClientMap().getControl());
@@ -38,7 +39,6 @@ const MapNode &FarContainer::getNodeRefUnsafe(const v3pos_t &pos)
 
 	if (!block && step < FARMESH_STEP_MAX) {
 		const auto &storage = m_client->getEnv().getClientMap().far_blocks_storage[step];
-
 		block = storage.get(bpos_aligned);
 	}
 
@@ -87,7 +87,7 @@ const MapNode &FarContainer::getNodeRefUnsafe(const v3pos_t &pos)
 	if (block) {
 		v3pos_t relpos = pos - bpos_aligned * MAP_BLOCKSIZE;
 
-		const auto &relpos_shift = step; // + 1;
+		const auto &relpos_shift = step;
 		const auto relpos_shifted = v3pos_t(relpos.X >> relpos_shift,
 				relpos.Y >> relpos_shift, relpos.Z >> relpos_shift);
 		const auto &n = block->getNodeNoLock(relpos_shifted);

src/client/fm_farmesh.cpp

@@ -83,6 +83,7 @@ void FarMesh::makeFarBlock(const v3bpos_t &blockpos, block_step_t step, bool nea
 		block->far_iteration = far_iteration_complete;
 		return;
 	}
+
 	MapBlockP block;
 	{
 		const auto lock = far_blocks.lock_unique_rec();
@@ -103,7 +104,7 @@ void FarMesh::makeFarBlock(const v3bpos_t &blockpos, block_step_t step, bool nea
 			}
 		}
 	}
-	
+
 	block->far_iteration = far_iteration_complete;
 
 	if (m_client->m_uptime >= block->far_make_mesh_timestamp) {

src/fm_world_merge.cpp

@@ -120,13 +120,14 @@ void WorldMerger::merge_one_block(MapDatabase *dbase, MapDatabase *dbase_up,
 			for (pos_t y = 0; y < block_size; ++y)
 				for (pos_t z = 0; z < block_size; ++z) {
 					const v3pos_t npos(x, y, z);
-					const v3pos_t bbpos(x >> (4 - step_pow), y >> (4 - step_pow),
-							z >> (4 - step_pow));
+					const v3pos_t bbpos(x >> (MAP_BLOCKP - step_pow),
+							y >> (MAP_BLOCKP - step_pow), z >> (MAP_BLOCKP - step_pow));
 
 					const auto &block = blocks[bbpos];
 					if (!block) {
 						continue;
 					}
+
 					const v3pos_t lpos((x << step_pow) % MAP_BLOCKSIZE,
 							(y << step_pow) % MAP_BLOCKSIZE,
 							(z << step_pow) % MAP_BLOCKSIZE);
@@ -394,6 +395,7 @@ bool WorldMerger::add_changed(const v3bpos_t &bpos)
 	changed_blocks_for_merge.clear();
 	return true;
 }
+
 void WorldMerger::init()
 {
 	m_map_compression_level =

src/map.cpp

@@ -868,9 +868,11 @@ size_t ServerMap::transformLiquids(std::map<v3bpos_t, MapBlock*> &modified_block
 		}
 
 		// Ignore light (because calling voxalgo::update_lighting_nodes)
+/*
 		ContentLightingFlags f0 = m_nodedef->getLightingFlags(n0);
 		n0.setLight(LIGHTBANK_DAY, 0, f0);
 		n0.setLight(LIGHTBANK_NIGHT, 0, f0);
+*/
 
 		// Find out whether there is a suspect for this action
 		std::string suspect;

src/server/activeobjectmgr.cpp

@@ -301,7 +301,7 @@ void ActiveObjectMgr::getAddedActiveObjectsAroundPos(const v3f &player_pos, f32
 		added_objects.push(id);
 
 
-		if (++count > 10)
+		if (++count > 10 && !current_objects.empty())
 			break;   
 
 	}

src/serverlist.cpp

@@ -111,10 +111,8 @@ Json::Value MakeReport(AnnounceAction action,
 		server["damage"]       = g_settings->getBool("enable_damage");
 		server["password"]     = g_settings->getBool("disallow_empty_password");
 		server["pvp"]          = g_settings->getBool("enable_pvp");
-		if (uptime >= 1)
-			server["uptime"]   = (int) uptime;
-		if (game_time >= 1)
-			server["game_time"]= game_time;
+		server["uptime"]   = (int) uptime;
+		server["game_time"]= game_time;
 		server["clients"]      = (int) clients_names.size();
 		server["clients_max"]  = g_settings->getU16("max_users");
 		server["clients_list"] = Json::Value(Json::arrayValue);