diff options
Diffstat (limited to 'src/script/cpp_api/s_item.cpp')
| -rw-r--r-- | src/script/cpp_api/s_item.cpp | 45 |
1 files changed, 35 insertions, 10 deletions
diff --git a/src/script/cpp_api/s_item.cpp b/src/script/cpp_api/s_item.cpp index 49729e57b..41413d61c 100644 --- a/src/script/cpp_api/s_item.cpp +++ b/src/script/cpp_api/s_item.cpp @@ -47,8 +47,13 @@ bool ScriptApiItem::item_OnDrop(ItemStack &item, pushFloatPos(L, pos); if(lua_pcall(L, 3, 1, errorhandler)) scriptError(); - if(!lua_isnil(L, -1)) - item = read_item(L,-1, getServer()); + if(!lua_isnil(L, -1)) { + try { + item = read_item(L,-1, getServer()); + } catch (LuaError &e) { + throw LuaError(std::string(e.what()) + ". item=" + item.name); + } + } lua_pop(L, 2); // Pop item and error handler return true; } @@ -71,8 +76,13 @@ bool ScriptApiItem::item_OnPlace(ItemStack &item, pushPointedThing(pointed); if(lua_pcall(L, 3, 1, errorhandler)) scriptError(); - if(!lua_isnil(L, -1)) - item = read_item(L,-1, getServer()); + if(!lua_isnil(L, -1)) { + try { + item = read_item(L,-1, getServer()); + } catch (LuaError &e) { + throw LuaError(std::string(e.what()) + ". item=" + item.name); + } + } lua_pop(L, 2); // Pop item and error handler return true; } @@ -95,8 +105,13 @@ bool ScriptApiItem::item_OnUse(ItemStack &item, pushPointedThing(pointed); if(lua_pcall(L, 3, 1, errorhandler)) scriptError(); - if(!lua_isnil(L, -1)) - item = read_item(L,-1, getServer()); + if(!lua_isnil(L, -1)) { + try { + item = read_item(L,-1, getServer()); + } catch (LuaError &e) { + throw LuaError(std::string(e.what()) + ". item=" + item.name); + } + } lua_pop(L, 2); // Pop item and error handler return true; } @@ -123,8 +138,13 @@ bool ScriptApiItem::item_OnCraft(ItemStack &item, ServerActiveObject *user, InvRef::create(L, craft_inv); if(lua_pcall(L, 4, 1, errorhandler)) scriptError(); - if(!lua_isnil(L, -1)) - item = read_item(L,-1, getServer()); + if(!lua_isnil(L, -1)) { + try { + item = read_item(L,-1, getServer()); + } catch (LuaError &e) { + throw LuaError(std::string(e.what()) + ". item=" + item.name); + } + } lua_pop(L, 2); // Pop item and error handler return true; } @@ -151,8 +171,13 @@ bool ScriptApiItem::item_CraftPredict(ItemStack &item, ServerActiveObject *user, InvRef::create(L, craft_inv); if(lua_pcall(L, 4, 1, errorhandler)) scriptError(); - if(!lua_isnil(L, -1)) - item = read_item(L,-1, getServer()); + if(!lua_isnil(L, -1)) { + try { + item = read_item(L,-1, getServer()); + } catch (LuaError &e) { + throw LuaError(std::string(e.what()) + ". item=" + item.name); + } + } lua_pop(L, 2); // Pop item and error handler return true; } |