luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-14 09:05:19 +02:00
Code Activity

ServerEnvironment: Remove direct dependency on EmergeManager

Browse Source
This commit is contained in:
kwolekr
2014-02-09 16:36:30 -05:00
parent a0683b811c
commit 89f7dc1efd
6 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/environment.cpp
View File

@@ -312,12 +312,10 @@ void ActiveBlockList::update(std::list<v3s16> &active_positions,
*/
ServerEnvironment::ServerEnvironment(ServerMap *map,
GameScripting *scriptIface,
IGameDef *gamedef, IBackgroundBlockEmerger *emerger):
GameScripting *scriptIface, IGameDef *gamedef):
m_map(map),
m_script(scriptIface),
m_gamedef(gamedef),
m_emerger(emerger),
m_random_spawn_timer(3),
m_send_recommended_timer(0),
m_active_block_interval_overload_skip(0),
@@ -1148,11 +1146,8 @@ void ServerEnvironment::step(float dtime)
{
v3s16 p = *i;
MapBlock *block = m_map->getBlockNoCreateNoEx(p);
MapBlock *block = m_map->getBlockOrEmerge(p);
if(block==NULL){
// Block needs to be fetched first
m_emerger->enqueueBlockEmerge(
PEER_ID_INEXISTENT, p, false);
m_active_blocks.m_list.erase(p);
continue;
}