Generate Notifier: Clear events once after all 'on generated' functions

diff --git a/src/emerge.cpp b/src/emerge.cpp
index ffe387f636c6d42b37e0e301a3929b129548056f..2778410531245d55182c177916f89c2e20f5de41 100644 (file)
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -585,6 +585,12 @@ MapBlock *EmergeThread::finishGen(v3s16 pos, BlockMakeData *bmdata,
                m_server->setAsyncFatalError("Lua: finishGen" + std::string(e.what()));
        }
 
+       /*
+               Clear generate notifier events
+       */
+       Mapgen *mg = m_emerge->getCurrentMapgen();
+       mg->gennotify.clearEvents();
+
        EMERGE_DBG_OUT("ended up with: " << analyze_block(block));
 
        /*

diff --git a/src/mapgen/mapgen.cpp b/src/mapgen/mapgen.cpp
index 5e581086f5399f3aa9a773fd0d9fab09595dde4d..5f7a9d6cff9dea03475cd7fe6bda0ed9b1baa83d 100644 (file)
--- a/src/mapgen/mapgen.cpp
+++ b/src/mapgen/mapgen.cpp
@@ -1003,8 +1003,7 @@ bool GenerateNotifier::addEvent(GenNotifyType type, v3s16 pos, u32 id)
 
 
 void GenerateNotifier::getEvents(
-       std::map<std::string, std::vector<v3s16> > &event_map,
-       bool peek_events)
+       std::map<std::string, std::vector<v3s16> > &event_map)
 {
        std::list<GenNotifyEvent>::iterator it;
 
@@ -1016,9 +1015,12 @@ void GenerateNotifier::getEvents(
 
                event_map[name].push_back(gn.pos);
        }
+}
+
 
-       if (!peek_events)
-               m_notify_events.clear();
+void GenerateNotifier::clearEvents()
+{
+       m_notify_events.clear();
 }
 
 

diff --git a/src/mapgen/mapgen.h b/src/mapgen/mapgen.h
index 6ca907573e2055b726f91b52136832ee4acdb7c7..2ebba68eab311d5f317f3c2f0732791c2fa7f5d4 100644 (file)
--- a/src/mapgen/mapgen.h
+++ b/src/mapgen/mapgen.h
@@ -99,8 +99,8 @@ public:
        void setNotifyOnDecoIds(std::set<u32> *notify_on_deco_ids);
 
        bool addEvent(GenNotifyType type, v3s16 pos, u32 id=0);
-       void getEvents(std::map<std::string, std::vector<v3s16> > &event_map,
-               bool peek_events=false);
+       void getEvents(std::map<std::string, std::vector<v3s16> > &event_map);
+       void clearEvents();
 
 private:
        u32 m_notify_on = 0;