luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-16 09:55:22 +02:00
Code Activity

Fix entity related bugs

Browse Source 
* Make minetest.add_entity() binary-safe
* Fix on_death pushing dummy ObjectRef instead of nil
This commit is contained in:
sfan5
2022-06-14 12:39:01 +02:00
parent 992f501159
commit e9e721b937
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/script/cpp_api/s_entity.cpp
View File

@@ -244,7 +244,7 @@ bool ScriptApiEntity::luaentity_Punch(u16 id,
{
SCRIPTAPI_PRECHECKHEADER
//infostream<<"scriptapi_luaentity_step: id="<<id<<std::endl;
assert(puncher);
int error_handler = PUSH_ERROR_HANDLER(L);
@@ -294,7 +294,10 @@ bool ScriptApiEntity::luaentity_run_simple_callback(u16 id,
}
luaL_checktype(L, -1, LUA_TFUNCTION);
lua_pushvalue(L, object); // self
objectrefGetOrCreate(L, sao); // killer reference
if (sao)
objectrefGetOrCreate(L, sao); // sao reference
else
lua_pushnil(L);
setOriginFromTable(object);
PCALL_RES(lua_pcall(L, 2, 1, error_handler));