Handle Lua errors in on_generate callbacks instead of throwing SIGABRT

diff --git a/src/emerge.cpp b/src/emerge.cpp
index f096bb874a21e84dbd41250556a66d0ca1aee1d4..2f757a760e3183c655f99684f5c7b1aa36c7c990 100644 (file)
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -554,9 +554,11 @@ void *EmergeThread::Thread() {
                                        MapEditEventAreaIgnorer
                                                ign(&m_server->m_ignore_map_edit_events_area,
                                                VoxelArea(minp, maxp));
-                                       {  // takes about 90ms with -O1 on an e3-1230v2
+                                       try {  // takes about 90ms with -O1 on an e3-1230v2
                                                m_server->getScriptIface()->environment_OnGenerated(
                                                                minp, maxp, emerge->getBlockSeed(minp));
+                                       } catch(LuaError &e) {
+                                               m_server->setAsyncFatalError(e.what());
                                        }
 
                                        EMERGE_DBG_OUT("ended up with: " << analyze_block(block));