Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-10 01:33:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle Lua errors in on_generate callbacks instead of throwing SIGABRT

Browse Source
This commit is contained in:
kwolekr 2013-12-14 01:59:16 -05:00
parent c3708b456e
commit 15c316765d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emerge.cpp
View File

@ -554,9 +554,11 @@ void *EmergeThread::Thread() {
MapEditEventAreaIgnorer MapEditEventAreaIgnorer
ign(&m_server->m_ignore_map_edit_events_area, ign(&m_server->m_ignore_map_edit_events_area,
VoxelArea(minp, maxp)); 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( m_server->getScriptIface()->environment_OnGenerated(
minp, maxp, emerge->getBlockSeed(minp)); minp, maxp, emerge->getBlockSeed(minp));
} catch(LuaError &e) {
m_server->setAsyncFatalError(e.what());
} }
EMERGE_DBG_OUT("ended up with: " << analyze_block(block)); EMERGE_DBG_OUT("ended up with: " << analyze_block(block));