Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-12-24 15:12:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Abort active ABM iteration when content changes (#12998)

Browse Source
This commit is contained in:
Jude Melton-Houghton 2022-11-27 15:55:10 -05:00 committed by GitHub
parent 40a45b8c99
commit 3fd5bff128
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/serverenvironment.cpp
View File

@ -888,7 +888,7 @@ public:
for(p0.Y=0; p0.Y<MAP_BLOCKSIZE; p0.Y++) for(p0.Y=0; p0.Y<MAP_BLOCKSIZE; p0.Y++)
for(p0.Z=0; p0.Z<MAP_BLOCKSIZE; p0.Z++) for(p0.Z=0; p0.Z<MAP_BLOCKSIZE; p0.Z++)
{ {
const MapNode &n = block->getNodeNoCheck(p0); MapNode n = block->getNodeNoCheck(p0);
content_t c = n.getContent(); content_t c = n.getContent();
// Cache content types as we go // Cache content types as we go
if (!block->contents_cached && !block->do_not_cache_contents) { if (!block->contents_cached && !block->do_not_cache_contents) {
@ -950,6 +950,11 @@ public:
active_object_count = countObjects(block, map, active_object_count_wider); active_object_count = countObjects(block, map, active_object_count_wider);
m_env->m_added_objects = 0; m_env->m_added_objects = 0;
} }
// Update and check node after possible modification
n = block->getNodeNoCheck(p0);
if (n.getContent() != c)
break;
} }
} }
block->contents_cached = !block->do_not_cache_contents; block->contents_cached = !block->do_not_cache_contents;
@ -1436,6 +1441,9 @@ void ServerEnvironment::step(float dtime)
ScopeProfiler sp(g_profiler, "SEnv: modify in blocks avg per interval", SPT_AVG); ScopeProfiler sp(g_profiler, "SEnv: modify in blocks avg per interval", SPT_AVG);
TimeTaker timer("modify in active blocks per interval"); TimeTaker timer("modify in active blocks per interval");
// Shuffle to prevent persistent artifacts of ordering
std::shuffle(m_abms.begin(), m_abms.end(), m_rgen);
// Initialize handling of ActiveBlockModifiers // Initialize handling of ActiveBlockModifiers
ABMHandler abmhandler(m_abms, m_cache_abm_interval, this, true); ABMHandler abmhandler(m_abms, m_cache_abm_interval, this, true);