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

master #7

Merged
BRNSystems merged 95 commits from Mirrorlandia_minetest/minetest:master into master 2024-01-28 00:16:42 +01:00
Conversation 0 Commits 95 Files Changed 224 +4 -4
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 59abf1bb42 - Show all commits

4
src/map.cpp
View File

@ -1579,11 +1579,11 @@ MapBlock * ServerMap::emergeBlock(v3s16 p, bool create_blank)
return NULL; return NULL;
} }
MapBlock *ServerMap::getBlockOrEmerge(v3s16 p3d) MapBlock *ServerMap::getBlockOrEmerge(v3s16 p3d, bool generate)
{ {
MapBlock *block = getBlockNoCreateNoEx(p3d); MapBlock *block = getBlockNoCreateNoEx(p3d);
if (block == NULL) if (block == NULL)
m_emerge->enqueueBlockEmerge(PEER_ID_INEXISTENT, p3d, false); m_emerge->enqueueBlockEmerge(PEER_ID_INEXISTENT, p3d, generate);
return block; return block;
} }

2
src/map.h
View File

@ -388,7 +388,7 @@ public:
- Memory - Memory
- Emerge Queue (deferred disk or generate) - Emerge Queue (deferred disk or generate)
*/ */
MapBlock *getBlockOrEmerge(v3s16 p3d); MapBlock *getBlockOrEmerge(v3s16 p3d, bool generate);
bool isBlockInQueue(v3s16 pos); bool isBlockInQueue(v3s16 pos);

2
src/serverenvironment.cpp
View File

@ -1457,7 +1457,7 @@ void ServerEnvironment::step(float dtime)
*/ */
for (const v3s16 &p: blocks_added) { for (const v3s16 &p: blocks_added) {
MapBlock *block = m_map->getBlockOrEmerge(p); MapBlock *block = m_map->getBlockOrEmerge(p, true);
if (!block) { if (!block) {
// TODO: The blocks removed here will only be picked up again // TODO: The blocks removed here will only be picked up again
// on the next cycle. To minimize the latency of objects being // on the next cycle. To minimize the latency of objects being