Fix CSM crash (#5779)

[dragonfireclient.git] / src / script / cpp_api / s_item.cpp

diff --git a/src/script/cpp_api/s_item.cpp b/src/script/cpp_api/s_item.cpp
index 1ca06de7646af2a4a16549df7b2bce391c5b83da..032018f2f7438c59bef671b7a5b3b85d3c290fc1 100644 (file)
--- a/src/script/cpp_api/s_item.cpp
+++ b/src/script/cpp_api/s_item.cpp
@@ -34,6 +34,8 @@ bool ScriptApiItem::item_OnDrop(ItemStack &item,
 {
        SCRIPTAPI_PRECHECKHEADER
 
+       int error_handler = PUSH_ERROR_HANDLER(L);
+
        // Push callback function on stack
        if (!getItemCallback(item.name.c_str(), "on_drop"))
                return false;
@@ -42,15 +44,15 @@ bool ScriptApiItem::item_OnDrop(ItemStack &item,
        LuaItemStack::create(L, item);
        objectrefGetOrCreate(L, dropper);
        pushFloatPos(L, pos);
-       PCALL_RES(lua_pcall(L, 3, 1, m_errorhandler));
+       PCALL_RES(lua_pcall(L, 3, 1, error_handler));
        if (!lua_isnil(L, -1)) {
                try {
-                       item = read_item(L,-1, getServer());
+                       item = read_item(L, -1, getServer()->idef());
                } catch (LuaError &e) {
                        throw LuaError(std::string(e.what()) + ". item=" + item.name);
                }
        }
-       lua_pop(L, 1);  // Pop item
+       lua_pop(L, 2);  // Pop item and error handler
        return true;
 }
 
@@ -59,6 +61,8 @@ bool ScriptApiItem::item_OnPlace(ItemStack &item,
 {
        SCRIPTAPI_PRECHECKHEADER
 
+       int error_handler = PUSH_ERROR_HANDLER(L);
+
        // Push callback function on stack
        if (!getItemCallback(item.name.c_str(), "on_place"))
                return false;
@@ -67,15 +71,15 @@ bool ScriptApiItem::item_OnPlace(ItemStack &item,
        LuaItemStack::create(L, item);
        objectrefGetOrCreate(L, placer);
        pushPointedThing(pointed);
-       PCALL_RES(lua_pcall(L, 3, 1, m_errorhandler));
+       PCALL_RES(lua_pcall(L, 3, 1, error_handler));
        if (!lua_isnil(L, -1)) {
                try {
-                       item = read_item(L,-1, getServer());
+                       item = read_item(L, -1, getServer()->idef());
                } catch (LuaError &e) {
                        throw LuaError(std::string(e.what()) + ". item=" + item.name);
                }
        }
-       lua_pop(L, 1);  // Pop item
+       lua_pop(L, 2);  // Pop item and error handler
        return true;
 }
 
@@ -84,6 +88,8 @@ bool ScriptApiItem::item_OnUse(ItemStack &item,
 {
        SCRIPTAPI_PRECHECKHEADER
 
+       int error_handler = PUSH_ERROR_HANDLER(L);
+
        // Push callback function on stack
        if (!getItemCallback(item.name.c_str(), "on_use"))
                return false;
@@ -92,15 +98,41 @@ bool ScriptApiItem::item_OnUse(ItemStack &item,
        LuaItemStack::create(L, item);
        objectrefGetOrCreate(L, user);
        pushPointedThing(pointed);
-       PCALL_RES(lua_pcall(L, 3, 1, m_errorhandler));
+       PCALL_RES(lua_pcall(L, 3, 1, error_handler));
        if(!lua_isnil(L, -1)) {
                try {
-                       item = read_item(L,-1, getServer());
+                       item = read_item(L, -1, getServer()->idef());
+               } catch (LuaError &e) {
+                       throw LuaError(std::string(e.what()) + ". item=" + item.name);
+               }
+       }
+       lua_pop(L, 2);  // Pop item and error handler
+       return true;
+}
+
+bool ScriptApiItem::item_OnSecondaryUse(ItemStack &item, ServerActiveObject *user)
+{
+       SCRIPTAPI_PRECHECKHEADER
+       
+       int error_handler = PUSH_ERROR_HANDLER(L);
+       
+       if (!getItemCallback(item.name.c_str(), "on_secondary_use"))
+               return false;
+       
+       LuaItemStack::create(L, item);
+       objectrefGetOrCreate(L, user);
+       PointedThing pointed;
+       pointed.type = POINTEDTHING_NOTHING;
+       pushPointedThing(pointed);
+       PCALL_RES(lua_pcall(L, 3, 1, error_handler));
+       if (!lua_isnil(L, -1)) {
+               try {
+                       item = read_item(L, -1, getServer()->idef());
                } catch (LuaError &e) {
                        throw LuaError(std::string(e.what()) + ". item=" + item.name);
                }
        }
-       lua_pop(L, 1);  // Pop item
+       lua_pop(L, 2);  // Pop item and error handler
        return true;
 }
 
@@ -109,6 +141,8 @@ bool ScriptApiItem::item_OnCraft(ItemStack &item, ServerActiveObject *user,
 {
        SCRIPTAPI_PRECHECKHEADER
 
+       int error_handler = PUSH_ERROR_HANDLER(L);
+
        lua_getglobal(L, "core");
        lua_getfield(L, -1, "on_craft");
        LuaItemStack::create(L, item);
@@ -122,15 +156,15 @@ bool ScriptApiItem::item_OnCraft(ItemStack &item, ServerActiveObject *user,
        push_items(L, items);
 
        InvRef::create(L, craft_inv);
-       PCALL_RES(lua_pcall(L, 4, 1, m_errorhandler));
+       PCALL_RES(lua_pcall(L, 4, 1, error_handler));
        if (!lua_isnil(L, -1)) {
                try {
-                       item = read_item(L,-1, getServer());
+                       item = read_item(L, -1, getServer()->idef());
                } catch (LuaError &e) {
                        throw LuaError(std::string(e.what()) + ". item=" + item.name);
                }
        }
-       lua_pop(L, 1);  // Pop item
+       lua_pop(L, 2);  // Pop item and error handler
        return true;
 }
 
@@ -139,6 +173,8 @@ bool ScriptApiItem::item_CraftPredict(ItemStack &item, ServerActiveObject *user,
 {
        SCRIPTAPI_PRECHECKHEADER
 
+       int error_handler = PUSH_ERROR_HANDLER(L);
+
        lua_getglobal(L, "core");
        lua_getfield(L, -1, "craft_predict");
        LuaItemStack::create(L, item);
@@ -152,15 +188,15 @@ bool ScriptApiItem::item_CraftPredict(ItemStack &item, ServerActiveObject *user,
        push_items(L, items);
 
        InvRef::create(L, craft_inv);
-       PCALL_RES(lua_pcall(L, 4, 1, m_errorhandler));
+       PCALL_RES(lua_pcall(L, 4, 1, error_handler));
        if (!lua_isnil(L, -1)) {
                try {
-                       item = read_item(L,-1, getServer());
+                       item = read_item(L, -1, getServer()->idef());
                } catch (LuaError &e) {
                        throw LuaError(std::string(e.what()) + ". item=" + item.name);
                }
        }
-       lua_pop(L, 1);  // Pop item
+       lua_pop(L, 2);  // Pop item and error handler
        return true;
 }
 
@@ -193,6 +229,9 @@ bool ScriptApiItem::getItemCallback(const char *name, const char *callbackname)
                lua_remove(L, -2);
                luaL_checktype(L, -1, LUA_TTABLE);
        }
+
+       setOriginFromTable(-1);
+
        lua_getfield(L, -1, callbackname);
        lua_remove(L, -2); // Remove item def
        // Should be a function or nil
@@ -210,27 +249,6 @@ void ScriptApiItem::pushPointedThing(const PointedThing& pointed)
 {
        lua_State* L = getStack();
 
-       lua_newtable(L);
-       if(pointed.type == POINTEDTHING_NODE)
-       {
-               lua_pushstring(L, "node");
-               lua_setfield(L, -2, "type");
-               push_v3s16(L, pointed.node_undersurface);
-               lua_setfield(L, -2, "under");
-               push_v3s16(L, pointed.node_abovesurface);
-               lua_setfield(L, -2, "above");
-       }
-       else if(pointed.type == POINTEDTHING_OBJECT)
-       {
-               lua_pushstring(L, "object");
-               lua_setfield(L, -2, "type");
-               objectrefGet(L, pointed.object_id);
-               lua_setfield(L, -2, "ref");
-       }
-       else
-       {
-               lua_pushstring(L, "nothing");
-               lua_setfield(L, -2, "type");
-       }
+       push_pointed_thing(L, pointed);
 }