luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-12-31 18:35:20 +01:00
Code Activity

Allow nil puncher in object:punch (#14319)

Browse Source
This commit is contained in:
sfence
2024-04-28 17:55:04 +02:00
committed by GitHub
parent fc0ac64277
commit 72cb4e9bea
11 changed files with 89 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -262,8 +262,6 @@ bool ScriptApiEntity::luaentity_Punch(u16 id,
{
SCRIPTAPI_PRECHECKHEADER
assert(puncher);
int error_handler = PUSH_ERROR_HANDLER(L);
// Get core.luaentities[id]
@@ -278,7 +276,10 @@ bool ScriptApiEntity::luaentity_Punch(u16 id,
}
luaL_checktype(L, -1, LUA_TFUNCTION);
lua_pushvalue(L, object); // self
objectrefGetOrCreate(L, puncher); // Clicker reference
if (puncher)
objectrefGetOrCreate(L, puncher); // Puncher reference
else
lua_pushnil(L);
lua_pushnumber(L, time_from_last_punch);
push_tool_capabilities(L, *toolcap);
push_v3f(L, dir);