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

paramat · paramat · commit 07622bf9b498 · 2018-03-03T22:59:49.000Z
diff --git 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
@@ -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
@@ -99,8 +99,8 @@ class GenerateNotifier {
 	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;

Original file line number	Diff line number	Diff line change
`@@ -1003,8 +1003,7 @@ bool GenerateNotifier::addEvent(GenNotifyType type, v3s16 pos, u32 id)`
`1003`	`1003`
`1004`	`1004`
`1005`	`1005`	`void GenerateNotifier::getEvents(`
`1006`		`- std::map<std::string, std::vector<v3s16> > &event_map,`
`1007`		`- bool peek_events)`
	`1006`	`+ std::map<std::string, std::vector<v3s16> > &event_map)`
`1008`	`1007`	`{`
`1009`	`1008`	`std::list<GenNotifyEvent>::iterator it;`
`1010`	`1009`
`@@ -1016,9 +1015,12 @@ void GenerateNotifier::getEvents(`
`1016`	`1015`
`1017`	`1016`	`event_map[name].push_back(gn.pos);`
`1018`	`1017`	`}`
	`1018`	`+}`
	`1019`	`+`
`1019`	`1020`
`1020`		`- if (!peek_events)`
`1021`		`- m_notify_events.clear();`
	`1021`	`+void GenerateNotifier::clearEvents()`
	`1022`	`+{`
	`1023`	`+ m_notify_events.clear();`
`1022`	`1024`	`}`
`1023`	`1025`
`1024`	`1026`