Skip to content
Permalink
Browse files

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

  • Loading branch information...
paramat committed Oct 24, 2018
1 parent ff35bff commit 622e2235ee700cf92843d2e99a47e36fd4508cf0
Showing with 17 additions and 9 deletions.
  1. +1 −1 doc/lua_api.txt
  2. +16 −8 src/script/lua_api/l_craft.cpp
@@ -3555,7 +3555,7 @@ Call these functions only at load time!
ignored. For input use the same recipe table syntax as for
`minetest.register_craft(recipe)`. For output specify only the item,
without a quantity.
* If no erase candidate could be found, Lua exception will be thrown.
* Returns false if no erase candidate could be found, otherwise returns true.
* **Warning**! The type field ("shaped", "cooking" or any other) will be
ignored if the recipe contains output. Erasing is then done independently
from the crafting method.
@@ -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)

0 comments on commit 622e223

Please sign in to comment.
You can’t perform that action at this time.