Cancel emerge callbacks on shutdown

[dragonfireclient.git] / src / emerge.cpp

diff --git a/src/emerge.cpp b/src/emerge.cpp
index bd1c1726d71cd45dd6d5cb19ddc52fc07e7a773c..55ae99caf25e657f609e575c503f453d45e79d9a 100644 (file)
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -367,12 +367,6 @@ bool EmergeManager::isBlockInQueue(v3s16 pos)
 //
 
 
-// TODO(hmmmm): Move this to ServerMap
-v3s16 EmergeManager::getContainingChunk(v3s16 blockpos)
-{
-       return getContainingChunk(blockpos, mgparams->chunksize);
-}
-
 // TODO(hmmmm): Move this to ServerMap
 v3s16 EmergeManager::getContainingChunk(v3s16 blockpos, s16 chunksize)
 {
@@ -396,17 +390,6 @@ int EmergeManager::getSpawnLevelAtPoint(v2s16 p)
 }
 
 
-int EmergeManager::getGroundLevelAtPoint(v2s16 p)
-{
-       if (m_mapgens.empty() || !m_mapgens[0]) {
-               errorstream << "EmergeManager: getGroundLevelAtPoint() called"
-                       " before mapgen init" << std::endl;
-               return 0;
-       }
-
-       return m_mapgens[0]->getGroundLevelAtPoint(p);
-}
-
 // TODO(hmmmm): Move this to ServerMap
 bool EmergeManager::isBlockUnderground(v3s16 blockpos)
 {
@@ -647,15 +630,17 @@ MapBlock *EmergeThread::finishGen(v3s16 pos, BlockMakeData *bmdata,
                m_server->getScriptIface()->environment_OnGenerated(
                        minp, maxp, m_mapgen->blockseed);
        } catch (LuaError &e) {
-               m_server->setAsyncFatalError("Lua: finishGen" + std::string(e.what()));
+               m_server->setAsyncFatalError(e);
        }
 
+       EMERGE_DBG_OUT("ended up with: " << analyze_block(block));
+
        /*
-               Clear generate notifier events
+               Clear mapgen state
        */
+       assert(!m_mapgen->generating);
        m_mapgen->gennotify.clearEvents();
-
-       EMERGE_DBG_OUT("ended up with: " << analyze_block(block));
+       m_mapgen->vm = nullptr;
 
        /*
                Activate the block
@@ -671,19 +656,19 @@ void *EmergeThread::run()
        BEGIN_DEBUG_EXCEPTION_HANDLER
 
        v3s16 pos;
+       std::map<v3s16, MapBlock *> modified_blocks;
 
-       m_map    = (ServerMap *)&(m_server->m_env->getMap());
+       m_map    = &m_server->m_env->getServerMap();
        m_emerge = m_server->m_emerge;
        m_mapgen = m_emerge->m_mapgens[id];
        enable_mapgen_debug_info = m_emerge->enable_mapgen_debug_info;
 
        try {
        while (!stopRequested()) {
-               std::map<v3s16, MapBlock *> modified_blocks;
                BlockEmergeData bedata;
                BlockMakeData bmdata;
                EmergeAction action;
-               MapBlock *block;
+               MapBlock *block = nullptr;
 
                if (!popBlockEmerge(&pos, &bedata)) {
                        m_queue_event.wait();
@@ -706,6 +691,8 @@ void *EmergeThread::run()
                        }
 
                        block = finishGen(pos, &bmdata, &modified_blocks);
+                       if (!block)
+                               action = EMERGE_ERRORED;
                }
 
                runCompletionCallbacks(pos, action, bedata.callbacks);
@@ -715,6 +702,7 @@ void *EmergeThread::run()
 
                if (!modified_blocks.empty())
                        m_server->SetBlocksNotSent(modified_blocks);
+               modified_blocks.clear();
        }
        } catch (VersionMismatchException &e) {
                std::ostringstream err;
@@ -736,6 +724,8 @@ void *EmergeThread::run()
                m_server->setAsyncFatalError(err.str());
        }
 
+       cancelPendingItems();
+
        END_DEBUG_EXCEPTION_HANDLER
        return NULL;
 }