Skip to content
Snippets Groups Projects
Commit 15c31676 authored by kwolekr's avatar kwolekr
Browse files

Handle Lua errors in on_generate callbacks instead of throwing SIGABRT

parent c3708b45
Branches
Tags
No related merge requests found
......@@ -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));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment