BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Add more informative error messages for inventory and item method errors

Browse Source
This commit is contained in:
ShadowNinja 2014-03-15 17:20:52 -04:00
parent 31fe72dbac
commit f3d83a4516
2 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/script/cpp_api/s_inventory.cpp
View File

@ -54,7 +54,7 @@ int ScriptApiDetached::detached_inventory_AllowMove(
if(lua_pcall(L, 7, 1, errorhandler)) if(lua_pcall(L, 7, 1, errorhandler))
scriptError(); scriptError();
if(!lua_isnumber(L, -1)) if(!lua_isnumber(L, -1))
throw LuaError("allow_move should return a number"); throw LuaError("allow_move should return a number. name=" + name);
int ret = luaL_checkinteger(L, -1); int ret = luaL_checkinteger(L, -1);
lua_pop(L, 2); // Pop integer and error handler lua_pop(L, 2); // Pop integer and error handler
return ret; return ret;
@ -86,7 +86,7 @@ int ScriptApiDetached::detached_inventory_AllowPut(
if(lua_pcall(L, 5, 1, errorhandler)) if(lua_pcall(L, 5, 1, errorhandler))
scriptError(); scriptError();
if(!lua_isnumber(L, -1)) if(!lua_isnumber(L, -1))
throw LuaError("allow_put should return a number"); throw LuaError("allow_put should return a number. name=" + name);
int ret = luaL_checkinteger(L, -1); int ret = luaL_checkinteger(L, -1);
lua_pop(L, 2); // Pop integer and error handler lua_pop(L, 2); // Pop integer and error handler
return ret; return ret;
@ -118,7 +118,7 @@ int ScriptApiDetached::detached_inventory_AllowTake(
if(lua_pcall(L, 5, 1, errorhandler)) if(lua_pcall(L, 5, 1, errorhandler))
scriptError(); scriptError();
if(!lua_isnumber(L, -1)) if(!lua_isnumber(L, -1))
throw LuaError("allow_take should return a number"); throw LuaError("allow_take should return a number. name=" + name);
int ret = luaL_checkinteger(L, -1); int ret = luaL_checkinteger(L, -1);
lua_pop(L, 2); // Pop integer and error handler lua_pop(L, 2); // Pop integer and error handler
return ret; return ret;

45
src/script/cpp_api/s_item.cpp
View File

@ -47,8 +47,13 @@ bool ScriptApiItem::item_OnDrop(ItemStack &item,
pushFloatPos(L, pos); pushFloatPos(L, pos);
if(lua_pcall(L, 3, 1, errorhandler)) if(lua_pcall(L, 3, 1, errorhandler))
scriptError(); scriptError();
if(!lua_isnil(L, -1)) if(!lua_isnil(L, -1)) {
item = read_item(L,-1, getServer()); 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 lua_pop(L, 2); // Pop item and error handler
return true; return true;
} }
@ -71,8 +76,13 @@ bool ScriptApiItem::item_OnPlace(ItemStack &item,
pushPointedThing(pointed); pushPointedThing(pointed);
if(lua_pcall(L, 3, 1, errorhandler)) if(lua_pcall(L, 3, 1, errorhandler))
scriptError(); scriptError();
if(!lua_isnil(L, -1)) if(!lua_isnil(L, -1)) {
item = read_item(L,-1, getServer()); 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 lua_pop(L, 2); // Pop item and error handler
return true; return true;
} }
@ -95,8 +105,13 @@ bool ScriptApiItem::item_OnUse(ItemStack &item,
pushPointedThing(pointed); pushPointedThing(pointed);
if(lua_pcall(L, 3, 1, errorhandler)) if(lua_pcall(L, 3, 1, errorhandler))
scriptError(); scriptError();
if(!lua_isnil(L, -1)) if(!lua_isnil(L, -1)) {
item = read_item(L,-1, getServer()); 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 lua_pop(L, 2); // Pop item and error handler
return true; return true;
} }
@ -123,8 +138,13 @@ bool ScriptApiItem::item_OnCraft(ItemStack &item, ServerActiveObject *user,
InvRef::create(L, craft_inv); InvRef::create(L, craft_inv);
if(lua_pcall(L, 4, 1, errorhandler)) if(lua_pcall(L, 4, 1, errorhandler))
scriptError(); scriptError();
if(!lua_isnil(L, -1)) if(!lua_isnil(L, -1)) {
item = read_item(L,-1, getServer()); 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 lua_pop(L, 2); // Pop item and error handler
return true; return true;
} }
@ -151,8 +171,13 @@ bool ScriptApiItem::item_CraftPredict(ItemStack &item, ServerActiveObject *user,
InvRef::create(L, craft_inv); InvRef::create(L, craft_inv);
if(lua_pcall(L, 4, 1, errorhandler)) if(lua_pcall(L, 4, 1, errorhandler))
scriptError(); scriptError();
if(!lua_isnil(L, -1)) if(!lua_isnil(L, -1)) {
item = read_item(L,-1, getServer()); 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 lua_pop(L, 2); // Pop item and error handler
return true; return true;
} }