Fix minetest.dig_node returning true when node isn't diggable (#10890)

[minetest.git] / src / script / cpp_api / s_entity.cpp

diff --git a/src/script/cpp_api/s_entity.cpp b/src/script/cpp_api/s_entity.cpp
index df4b77936836fba837154c63e5a1d472c680a02c..746f7013e99d6505770b308378a165d47f1b331f 100644 (file)
--- a/src/script/cpp_api/s_entity.cpp
+++ b/src/script/cpp_api/s_entity.cpp
@@ -103,6 +103,32 @@ void ScriptApiEntity::luaentity_Activate(u16 id,
        lua_pop(L, 2); // Pop object and error handler
 }
 
+void ScriptApiEntity::luaentity_Deactivate(u16 id)
+{
+       SCRIPTAPI_PRECHECKHEADER
+
+       verbosestream << "scriptapi_luaentity_deactivate: id=" << id << std::endl;
+
+       int error_handler = PUSH_ERROR_HANDLER(L);
+
+       // Get the entity
+       luaentity_get(L, id);
+       int object = lua_gettop(L);
+
+       // Get on_deactivate
+       lua_getfield(L, -1, "on_deactivate");
+       if (!lua_isnil(L, -1)) {
+               luaL_checktype(L, -1, LUA_TFUNCTION);
+               lua_pushvalue(L, object);
+
+               setOriginFromTable(object);
+               PCALL_RES(lua_pcall(L, 1, 0, error_handler));
+       } else {
+               lua_pop(L, 1);
+       }
+       lua_pop(L, 2); // Pop object and error handler
+}
+
 void ScriptApiEntity::luaentity_Remove(u16 id)
 {
        SCRIPTAPI_PRECHECKHEADER
@@ -157,7 +183,7 @@ std::string ScriptApiEntity::luaentity_GetStaticdata(u16 id)
 }
 
 void ScriptApiEntity::luaentity_GetProperties(u16 id,
-               ObjectProperties *prop)
+               ServerActiveObject *self, ObjectProperties *prop)
 {
        SCRIPTAPI_PRECHECKHEADER
 
@@ -169,39 +195,20 @@ void ScriptApiEntity::luaentity_GetProperties(u16 id,
        // Set default values that differ from ObjectProperties defaults
        prop->hp_max = 10;
 
-       /* Read stuff */
-
-       prop->hp_max = getintfield_default(L, -1, "hp_max", 10);
-
-       getboolfield(L, -1, "physical", prop->physical);
-       getboolfield(L, -1, "collide_with_objects", prop->collideWithObjects);
-
-       getfloatfield(L, -1, "weight", prop->weight);
-
-       lua_getfield(L, -1, "collisionbox");
-       if (lua_istable(L, -1))
-               prop->collisionbox = read_aabb3f(L, -1, 1.0);
-       lua_pop(L, 1);
-
-       getstringfield(L, -1, "visual", prop->visual);
-
-       getstringfield(L, -1, "mesh", prop->mesh);
-
        // Deprecated: read object properties directly
-       read_object_properties(L, -1, prop, getServer()->idef());
+       read_object_properties(L, -1, self, prop, getServer()->idef());
 
        // Read initial_properties
        lua_getfield(L, -1, "initial_properties");
-       read_object_properties(L, -1, prop, getServer()->idef());
+       read_object_properties(L, -1, self, prop, getServer()->idef());
        lua_pop(L, 1);
 }
 
-void ScriptApiEntity::luaentity_Step(u16 id, float dtime)
+void ScriptApiEntity::luaentity_Step(u16 id, float dtime,
+       const collisionMoveResult *moveresult)
 {
        SCRIPTAPI_PRECHECKHEADER
 
-       //infostream<<"scriptapi_luaentity_step: id="<<id<<std::endl;
-
        int error_handler = PUSH_ERROR_HANDLER(L);
 
        // Get core.luaentities[id]
@@ -217,9 +224,14 @@ void ScriptApiEntity::luaentity_Step(u16 id, float dtime)
        luaL_checktype(L, -1, LUA_TFUNCTION);
        lua_pushvalue(L, object); // self
        lua_pushnumber(L, dtime); // dtime
+       /* moveresult */
+       if (moveresult)
+               push_collision_move_result(L, *moveresult);
+       else
+               lua_pushnil(L);
 
        setOriginFromTable(object);
-       PCALL_RES(lua_pcall(L, 2, 0, error_handler));
+       PCALL_RES(lua_pcall(L, 3, 0, error_handler));
 
        lua_pop(L, 2); // Pop object and error handler
 }
@@ -257,12 +269,14 @@ bool ScriptApiEntity::luaentity_Punch(u16 id,
        setOriginFromTable(object);
        PCALL_RES(lua_pcall(L, 6, 1, error_handler));
 
-       bool retval = lua_toboolean(L, -1);
+       bool retval = readParam<bool>(L, -1);
        lua_pop(L, 2); // Pop object and error handler
        return retval;
 }
 
-bool ScriptApiEntity::luaentity_on_death(u16 id, ServerActiveObject *killer)
+// Calls entity[field](ObjectRef self, ObjectRef sao)
+bool ScriptApiEntity::luaentity_run_simple_callback(u16 id,
+       ServerActiveObject *sao, const char *field)
 {
        SCRIPTAPI_PRECHECKHEADER
 
@@ -273,50 +287,45 @@ bool ScriptApiEntity::luaentity_on_death(u16 id, ServerActiveObject *killer)
        int object = lua_gettop(L);
        // State: object is at top of stack
        // Get function
-       lua_getfield(L, -1, "on_death");
+       lua_getfield(L, -1, field);
        if (lua_isnil(L, -1)) {
-               lua_pop(L, 2); // Pop on_death and entity
+               lua_pop(L, 2); // Pop callback field and entity
                return false;
        }
        luaL_checktype(L, -1, LUA_TFUNCTION);
        lua_pushvalue(L, object);  // self
-       objectrefGetOrCreate(L, killer);  // killer reference
+       objectrefGetOrCreate(L, sao);  // killer reference
 
        setOriginFromTable(object);
        PCALL_RES(lua_pcall(L, 2, 1, error_handler));
 
-       bool retval = lua_toboolean(L, -1);
+       bool retval = readParam<bool>(L, -1);
        lua_pop(L, 2); // Pop object and error handler
        return retval;
 }
 
-// Calls entity:on_rightclick(ObjectRef clicker)
-void ScriptApiEntity::luaentity_Rightclick(u16 id,
-               ServerActiveObject *clicker)
+bool ScriptApiEntity::luaentity_on_death(u16 id, ServerActiveObject *killer)
 {
-       SCRIPTAPI_PRECHECKHEADER
-
-       //infostream<<"scriptapi_luaentity_step: id="<<id<<std::endl;
-
-       int error_handler = PUSH_ERROR_HANDLER(L);
+       return luaentity_run_simple_callback(id, killer, "on_death");
+}
 
-       // Get core.luaentities[id]
-       luaentity_get(L, id);
-       int object = lua_gettop(L);
-       // State: object is at top of stack
-       // Get function
-       lua_getfield(L, -1, "on_rightclick");
-       if (lua_isnil(L, -1)) {
-               lua_pop(L, 2); // Pop on_rightclick and entity
-               return;
-       }
-       luaL_checktype(L, -1, LUA_TFUNCTION);
-       lua_pushvalue(L, object); // self
-       objectrefGetOrCreate(L, clicker); // Clicker reference
+// Calls entity:on_rightclick(ObjectRef clicker)
+void ScriptApiEntity::luaentity_Rightclick(u16 id, ServerActiveObject *clicker)
+{
+       luaentity_run_simple_callback(id, clicker, "on_rightclick");
+}
 
-       setOriginFromTable(object);
-       PCALL_RES(lua_pcall(L, 2, 0, error_handler));
+void ScriptApiEntity::luaentity_on_attach_child(u16 id, ServerActiveObject *child)
+{
+       luaentity_run_simple_callback(id, child, "on_attach_child");
+}
 
-       lua_pop(L, 2); // Pop object and error handler
+void ScriptApiEntity::luaentity_on_detach_child(u16 id, ServerActiveObject *child)
+{
+       luaentity_run_simple_callback(id, child, "on_detach_child");
 }
 
+void ScriptApiEntity::luaentity_on_detach(u16 id, ServerActiveObject *parent)
+{
+       luaentity_run_simple_callback(id, parent, "on_detach");
+}