Skip to content
Snippets Groups Projects
Commit 458045d4 authored by ShadowNinja's avatar ShadowNinja
Browse files

Fix crash when a error occurs in a globalstep callback

parent fbef701b
No related branches found
No related tags found
No related merge requests found
......@@ -24,6 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "environment.h"
#include "mapgen.h"
#include "lua_api/l_env.h"
#include "server.h"
void ScriptApiEnv::environment_OnGenerated(v3s16 minp, v3s16 maxp,
u32 blockseed)
......@@ -50,7 +51,11 @@ void ScriptApiEnv::environment_Step(float dtime)
lua_getfield(L, -1, "registered_globalsteps");
// Call callbacks
lua_pushnumber(L, dtime);
script_run_callbacks(L, 1, RUN_CALLBACKS_MODE_FIRST);
try {
script_run_callbacks(L, 1, RUN_CALLBACKS_MODE_FIRST);
} catch (LuaError &e) {
getServer()->setAsyncFatalError(e.what());
}
}
void ScriptApiEnv::environment_OnMapgenInit(MapgenParams *mgparams)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment