diff options
Diffstat (limited to 'src/script/cpp_api/s_item.cpp')
| -rw-r--r-- | src/script/cpp_api/s_item.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/script/cpp_api/s_item.cpp b/src/script/cpp_api/s_item.cpp index 032018f2f..d48a3aee9 100644 --- a/src/script/cpp_api/s_item.cpp +++ b/src/script/cpp_api/s_item.cpp @@ -113,12 +113,12 @@ bool ScriptApiItem::item_OnUse(ItemStack &item, 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; @@ -237,7 +237,9 @@ bool ScriptApiItem::getItemCallback(const char *name, const char *callbackname) // Should be a function or nil if (lua_type(L, -1) == LUA_TFUNCTION) { return true; - } else if (!lua_isnil(L, -1)) { + } + + if (!lua_isnil(L, -1)) { errorstream << "Item \"" << name << "\" callback \"" << callbackname << "\" is not a function" << std::endl; } |