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

paramat · web-flow · commit 622e2235ee70 · 2018-10-24T15:03:21.000+01:00
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
@@ -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.
diff --git a/src/script/lua_api/l_craft.cpp b/src/script/lua_api/l_craft.cpp
@@ -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)
