oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Encapsulate envlock

Browse source
This commit is contained in:
sfan5 2024-09-15 21:25:03 +02:00
parent 588a0f83e9
commit 0220d0d492
4 changed files with 31 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/emerge.cpp
View file

@ -540,7 +540,7 @@ bool EmergeThread::popBlockEmerge(v3s16 *pos, BlockEmergeData *bedata)
EmergeAction EmergeThread::getBlockOrStartGen(const v3s16 pos, bool allow_gen,
const std::string *from_db, MapBlock **block, BlockMakeData *bmdata)
{
MutexAutoLock envlock(m_server->m_env_mutex);
Server::EnvAutoLock envlock(m_server);
auto block_ok = [] (MapBlock *b) {
return b && b->isGenerated();
@ -581,7 +581,7 @@ EmergeAction EmergeThread::getBlockOrStartGen(const v3s16 pos, bool allow_gen,
MapBlock *EmergeThread::finishGen(v3s16 pos, BlockMakeData *bmdata,
std::map<v3s16, MapBlock *> *modified_blocks)
{
MutexAutoLock envlock(m_server->m_env_mutex);
Server::EnvAutoLock envlock(m_server);
ScopeProfiler sp(g_profiler,
"EmergeThread: after Mapgen::makeChunk", SPT_AVG);
@ -762,7 +762,7 @@ void *EmergeThread::run()
MapEditEvent event;
event.type = MEET_OTHER;
event.setModifiedBlocks(modified_blocks);
MutexAutoLock envlock(m_server->m_env_mutex);
Server::EnvAutoLock envlock(m_server);
m_map->dispatchEvent(event);
}
modified_blocks.clear();