BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Slight simplification of RemoteClient::getNextBlocks(...) (#14302)

Browse Source
This commit is contained in:
lhofhansl 2024-01-25 11:32:18 -08:00 committed by GitHub
parent 4468813d47
commit 2ef080a51b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/clientiface.cpp
View File

@ -345,11 +345,13 @@ void RemoteClient::GetNextBlocks (
if (m_blocks_sent.find(p) != m_blocks_sent.end()) if (m_blocks_sent.find(p) != m_blocks_sent.end())
continue; continue;
bool block_not_found = false;
if (block) { if (block) {
// Check whether the block exists (with data) /*
if (!block->isGenerated()) If block is not generated and generating new ones is
block_not_found = true; not wanted, skip block.
*/
if (!block->isGenerated() && !generate)
continue;
/* /*
If block is not close, don't send it unless it is near If block is not close, don't send it unless it is near
@ -379,19 +381,10 @@ void RemoteClient::GetNextBlocks (
continue; continue;
} }
/*
If block has been marked to not exist on disk (dummy) or is
not generated and generating new ones is not wanted, skip block.
*/
if (!generate && block_not_found) {
// get next one.
continue;
}
/* /*
Add inexistent block to emerge queue. Add inexistent block to emerge queue.
*/ */
if (block == NULL || block_not_found) { if (!block || !block->isGenerated()) {
if (emerge->enqueueBlockEmerge(peer_id, p, generate)) { if (emerge->enqueueBlockEmerge(peer_id, p, generate)) {
if (nearest_emerged_d == -1) if (nearest_emerged_d == -1)
nearest_emerged_d = d; nearest_emerged_d = d;