minetest/minetest
1
0
Fork 0
mirror of https://github.com/minetest/minetest.git synced 2025-07-05 01:10:22 +02:00
Code Issues Releases Wiki Activity

Re-save active entities more often if they move a certain distance (#15605)

Browse Source
This commit is contained in:
Andrii Nemchenko
2025-02-22 17:19:19 +02:00
committed by GitHub
parent d12ce68e64
commit abcd2e0b81
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/serverenvironment.cpp
View File

@ -43,6 +43,8 @@
// A number that is much smaller than the timeout for particle spawners should/could ever be // A number that is much smaller than the timeout for particle spawners should/could ever be
#define PARTICLE_SPAWNER_NO_EXPIRY -1024.f #define PARTICLE_SPAWNER_NO_EXPIRY -1024.f
static constexpr s16 ACTIVE_OBJECT_RESAVE_DISTANCE_SQ = 3 * 3;
/* /*
ABMWithState ABMWithState
*/ */
@ -2160,12 +2162,14 @@ void ServerEnvironment::deactivateFarObjects(const bool _force_delete)
// The block in which the object resides in // The block in which the object resides in
v3s16 blockpos_o = getNodeBlockPos(floatToInt(objectpos, BS)); v3s16 blockpos_o = getNodeBlockPos(floatToInt(objectpos, BS));
// If object's static data is stored in a deactivated block and object // If object's static data is stored in a deactivated block or it has moved a bunch
// is actually located in an active block, re-save to the block in // then re-save to the block in which the object is now located in.
// which the object is actually located in. // This only applies if the object is in a currently active block, since deactivating
// is handled by the code further below.
if (!force_delete && obj->isStaticAllowed() && obj->m_static_exists && if (!force_delete && obj->isStaticAllowed() && obj->m_static_exists &&
!m_active_blocks.contains(obj->m_static_block) && m_active_blocks.contains(blockpos_o) &&
m_active_blocks.contains(blockpos_o)) { (!m_active_blocks.contains(obj->m_static_block) ||
blockpos_o.getDistanceFromSQ(obj->m_static_block) >= ACTIVE_OBJECT_RESAVE_DISTANCE_SQ)) {
// Delete from block where object was located // Delete from block where object was located
deleteStaticFromBlock(obj, id, MOD_REASON_STATIC_DATA_REMOVED, false); deleteStaticFromBlock(obj, id, MOD_REASON_STATIC_DATA_REMOVED, false);