luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-26 21:35:28 +01:00
Code Activity

Slight fix to #15949 to handle emerge queue full (#15960)

Browse Source 
Partially restore the existing logic, and try to enqueue a block as before, if the queue is full it will be handled correctly.
This commit is contained in:
lhofhansl
2025-03-31 21:31:10 -07:00
committed by GitHub
parent 1281173e50
commit 6724068659
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/clientiface.cpp
View File

@@ -343,11 +343,7 @@ void RemoteClient::GetNextBlocks (
const bool want_emerge = !block || !block->isGenerated(); const bool want_emerge = !block || !block->isGenerated();
// if the block is already in the emerge queue we don't have to check again // if the block is already in the emerge queue we don't have to check again
if (want_emerge && emerge->isBlockInQueue(p)) { if (!want_emerge || !emerge->isBlockInQueue(p)) {
nearest_emerged_d = d;
continue;
}
/* /*
Check occlusion cache first. Check occlusion cache first.
*/ */
@@ -362,6 +358,7 @@ void RemoteClient::GetNextBlocks (
m_blocks_occ.insert(p); m_blocks_occ.insert(p);
continue; continue;
} }
}
/* /*
Add inexistent block to emerge queue. Add inexistent block to emerge queue.