Skip to content
Permalink
Browse files

script: Fix add_entity returning unusable ref if object deleted in on…

…_activate
  • Loading branch information
sfan5 authored and nerzhul committed Apr 27, 2020
1 parent e564bf8 commit f6f6dd140f14a40a43a63a1ba3eccc66fd56d514
Showing with 5 additions and 5 deletions.
  1. +5 −5 src/script/lua_api/l_env.cpp
@@ -589,19 +589,19 @@ int ModApiEnvMod::l_add_entity(lua_State *L)
{
GET_ENV_PTR;

// pos
v3f pos = checkFloatPos(L, 1);
// content
const char *name = luaL_checkstring(L, 2);
// staticdata
const char *staticdata = luaL_optstring(L, 3, "");
// Do it

ServerActiveObject *obj = new LuaEntitySAO(env, pos, name, staticdata);
int objectid = env->addActiveObject(obj);
// If failed to add, return nothing (reads as nil)
if(objectid == 0)
return 0;
// Return ObjectRef

// If already deleted (can happen in on_activate), return nil
if (obj->isGone())
return 0;
getScriptApiBase(L)->objectrefGetOrCreate(L, obj);
return 1;
}

0 comments on commit f6f6dd1

Please sign in to comment.