Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / server / luaentity_sao.cpp

diff --git a/src/server/luaentity_sao.cpp b/src/server/luaentity_sao.cpp
index 3bcbe107b39beb7602a6175b1432bb0397d9f97f..82f6da2314f8392d66b924844f53d3d6a3a385c2 100644 (file)
--- a/src/server/luaentity_sao.cpp
+++ b/src/server/luaentity_sao.cpp
@@ -108,7 +108,12 @@ void LuaEntitySAO::addedToEnvironment(u32 dtime_s)
                m_env->getScriptIface()->
                        luaentity_Activate(m_id, m_init_state, dtime_s);
        } else {
+               // It's an unknown object
+               // Use entitystring as infotext for debugging
                m_prop.infotext = m_init_name;
+               // Set unknown object texture
+               m_prop.textures.clear();
+               m_prop.textures.emplace_back("unknown_object.png");
        }
 }
 
@@ -300,10 +305,11 @@ void LuaEntitySAO::getStaticData(std::string *result) const
        *result = os.str();
 }
 
-u16 LuaEntitySAO::punch(v3f dir,
+u32 LuaEntitySAO::punch(v3f dir,
                const ToolCapabilities *toolcap,
                ServerActiveObject *puncher,
-               float time_from_last_punch)
+               float time_from_last_punch,
+               u16 initial_wear)
 {
        if (!m_registered) {
                // Delete unknown LuaEntities when punched
@@ -321,7 +327,8 @@ u16 LuaEntitySAO::punch(v3f dir,
                        m_armor_groups,
                        toolcap,
                        &tool_item,
-                       time_from_last_punch);
+                       time_from_last_punch,
+                       initial_wear);
 
        bool damage_handled = m_env->getScriptIface()->luaentity_Punch(m_id, puncher,
                        time_from_last_punch, toolcap, dir, result.did_punch ? result.damage : 0);