oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-27 17:28:41 +00:00
Code Wiki Activity

Make sure generated blocks have their timestamp set

Browse source 
behavior change: newly generated blocks are no longer momentarily activated.
this shouldn't matter for anyone and did not consistently apply to all blocks anyway

addresses issue from #15902 for new maps(!)
This commit is contained in:
sfan5 2025-03-18 21:50:17 +01:00
parent ed40ea010b
commit 7b746d21f9
8 changed files with 66 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/serverenvironment.cpp
View file

@ -394,10 +394,8 @@ void ActiveBlockList::update(std::vector<PlayerSAO*> &active_players,
*/
std::set<v3s16> newlist = m_forceloaded_list;
std::set<v3s16> extralist;
m_abm_list = m_forceloaded_list;
for (const PlayerSAO *playersao : active_players) {
v3s16 pos = getNodeBlockPos(floatToInt(playersao->getBasePosition(), BS));
fillRadiusBlock(pos, active_block_range, m_abm_list);
fillRadiusBlock(pos, active_block_range, newlist);
s16 player_ao_range = std::min(active_object_range, playersao->getWantedRange());
@ -417,6 +415,8 @@ void ActiveBlockList::update(std::vector<PlayerSAO*> &active_players,
}
}
m_abm_list = newlist;
/*
Find out which blocks on the new list are not on the old list
*/
@ -448,6 +448,7 @@ void ActiveBlockList::update(std::vector<PlayerSAO*> &active_players,
Do some least-effort sanity checks to hopefully catch code bugs.
*/
assert(newlist.size() >= extralist.size());
assert(newlist.size() >= m_abm_list.size());
assert(blocks_removed.size() <= m_list.size());
if (!blocks_added.empty()) {
assert(newlist.count(*blocks_added.begin()) > 0);
@ -1076,6 +1077,14 @@ public:
}
};
void ServerEnvironment::forceActivateBlock(MapBlock *block)
{
assert(block);
if (m_active_blocks.add(block->getPos()))
activateBlock(block);
}
void ServerEnvironment::activateBlock(MapBlock *block, u32 additional_dtime)
{
// Reset usage timer immediately, otherwise a block that becomes active