diff options
| author | kwolekr <kwolekr@minetest.net> | 2015-03-20 18:40:18 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2015-03-20 18:41:26 -0400 |
| commit | 26153bab7dbe57a0200949c9a121058150e67f6c (patch) | |
| tree | cda3013a86b95c29779b977aa95c03e1fac4be00 /src/mapgen.cpp | |
| parent | d03c2999daafaff5b48948bb97a5854f5fb56484 (diff) | |
| download | minetest-26153bab7dbe57a0200949c9a121058150e67f6c.tar.gz minetest-26153bab7dbe57a0200949c9a121058150e67f6c.tar.bz2 minetest-26153bab7dbe57a0200949c9a121058150e67f6c.zip | |
Revert "Fix issue #2441: crash on respawn, since a conversion std::list to std::vector on Environment.cpp"
This reverts parts of commit 9749d9fee6db99da1ab861dc04ec63ef973db3e0, which breaks node resolver
list clearing
Diffstat (limited to 'src/mapgen.cpp')
| -rw-r--r-- | src/mapgen.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mapgen.cpp b/src/mapgen.cpp index 137418471..fd4fe5bb0 100644 --- a/src/mapgen.cpp +++ b/src/mapgen.cpp @@ -412,8 +412,9 @@ void GenerateNotifier::getEvents( std::map<std::string, std::vector<v3s16> > &event_map, bool peek_events) { - for (std::vector<GenNotifyEvent>::iterator it = m_notify_events.begin(); - it != m_notify_events.end(); ++it) { + std::list<GenNotifyEvent>::iterator it; + + for (it = m_notify_events.begin(); it != m_notify_events.end(); ++it) { GenNotifyEvent &gn = *it; std::string name = (gn.type == GENNOTIFY_DECORATION) ? "decoration#"+ itos(gn.id) : |