oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

clear_craft: Return false if recipe not found, don't throw error (#7804)

Browse source
This commit is contained in:
Paramat 2018-10-24 15:03:21 +01:00 • committed by GitHub
parent ff35bffe18
commit 622e2235ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/script/lua_api/l_craft.cpp
View file

@ -294,11 +294,14 @@ int ModApiCraft::l_clear_craft(lua_State *L)
std::string type = getstringfield_default(L, table, "type", "shaped");
CraftOutput c_output(output, 0);
if (!output.empty()) {
if (craftdef->clearCraftRecipesByOutput(c_output, getServer(L)))
return 0;
if (craftdef->clearCraftRecipesByOutput(c_output, getServer(L))) {
lua_pushboolean(L, true);
return 1;
}
throw LuaError("No craft recipe known for output"
" (output=\"" + output + "\")");
warningstream << "No craft recipe known for output" << std::endl;
lua_pushboolean(L, false);
return 1;
}
std::vector<std::string> recipe;
int width = 0;
@ -347,10 +350,15 @@ int ModApiCraft::l_clear_craft(lua_State *L)
} else {
throw LuaError("Unknown crafting definition type: \"" + type + "\"");
}
if (!craftdef->clearCraftRecipesByInput(method, width, recipe, getServer(L)))
throw LuaError("No crafting specified for input");
lua_pop(L, 1);
return 0;
if (!craftdef->clearCraftRecipesByInput(method, width, recipe, getServer(L))) {
warningstream << "No craft recipe matches input" << std::endl;
lua_pushboolean(L, false);
return 1;
}
lua_pushboolean(L, true);
return 1;
}
// get_craft_result(input)