Skip to content
Permalink
Browse files

Check for 'action' field in ABMs & LBMs

  • Loading branch information...
SmallJoker committed Jul 27, 2019
1 parent fe6c666 commit 8efa1de8356630f2943e3d74e7287b5e976e8706
Showing with 10 additions and 0 deletions.
  1. +2 −0 builtin/game/register.lua
  2. +8 −0 src/script/cpp_api/s_env.cpp
@@ -79,13 +79,15 @@ end

function core.register_abm(spec)
-- Add to core.registered_abms
assert(type(spec.action) == "function", "Required field 'action' of type function")
core.registered_abms[#core.registered_abms + 1] = spec
spec.mod_origin = core.get_current_modname() or "??"
end

function core.register_lbm(spec)
-- Add to core.registered_lbms
check_modname_prefix(spec.name)
assert(type(spec.action) == "function", "Required field 'action' of type function")
core.registered_lbms[#core.registered_lbms + 1] = spec
spec.mod_origin = core.get_current_modname() or "??"
end
@@ -151,6 +151,10 @@ void ScriptApiEnv::initializeEnvironment(ServerEnvironment *env)
bool simple_catch_up = true;
getboolfield(L, current_abm, "catch_up", simple_catch_up);

lua_getfield(L, current_abm, "action");
luaL_checktype(L, current_abm + 1, LUA_TFUNCTION);
lua_pop(L, 1);

LuaABM *abm = new LuaABM(L, id, trigger_contents, required_neighbors,
trigger_interval, trigger_chance, simple_catch_up);

@@ -200,6 +204,10 @@ void ScriptApiEnv::initializeEnvironment(ServerEnvironment *env)
bool run_at_every_load = getboolfield_default(L, current_lbm,
"run_at_every_load", false);

lua_getfield(L, current_lbm, "action");
luaL_checktype(L, current_lbm + 1, LUA_TFUNCTION);
lua_pop(L, 1);

LuaLBM *lbm = new LuaLBM(L, id, trigger_contents, name,
run_at_every_load);

0 comments on commit 8efa1de

Please sign in to comment.
You can’t perform that action at this time.