diff options
| author | kwolekr <kwolekr@minetest.net> | 2014-02-09 16:36:30 -0500 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2014-02-09 16:36:30 -0500 |
| commit | 89f7dc1efd6b0062b4b9e5c3509c301ccadb7a13 (patch) | |
| tree | 0906b5428135a32dfbacb97601586555305c6927 /src/environment.cpp | |
| parent | a0683b811c6641528161050ea91f0425f038fa90 (diff) | |
| download | minetest-89f7dc1efd6b0062b4b9e5c3509c301ccadb7a13.tar.gz minetest-89f7dc1efd6b0062b4b9e5c3509c301ccadb7a13.tar.bz2 minetest-89f7dc1efd6b0062b4b9e5c3509c301ccadb7a13.zip | |
ServerEnvironment: Remove direct dependency on EmergeManager
Diffstat (limited to 'src/environment.cpp')
| -rw-r--r-- | src/environment.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/environment.cpp b/src/environment.cpp index aea3afeaa..08564046e 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -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; } |