minetest-mods/technic
1
0
Fork 1
mirror of https://github.com/minetest-mods/technic.git synced 2024-12-25 18:30:29 +01:00
Code Issues Releases Wiki Activity

prevent crash if get_recipe_index() is passed a nil or apparent garbage instead

Browse Source 
of a table
This commit is contained in:
Vanessa Ezekowitz 2015-01-12 17:34:35 -05:00
parent 4ac36e9d27
commit bc0ac581aa
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
technic/machines/register/recipes.lua
View File

@ -17,6 +17,7 @@ function technic.register_recipe_type(typename, origdata)
end end
local function get_recipe_index(items) local function get_recipe_index(items)
if not items or type(items) ~= "table" then return false end
local l = {} local l = {}
for i, stack in ipairs(items) do for i, stack in ipairs(items) do
l[i] = ItemStack(stack):get_name() l[i] = ItemStack(stack):get_name()
@ -40,6 +41,10 @@ local function register_recipe(typename, data)
local recipe = {time = data.time, input = {}, output = data.output} local recipe = {time = data.time, input = {}, output = data.output}
local index = get_recipe_index(data.input) local index = get_recipe_index(data.input)
if not index then
print("[Technic] ignored registration of garbage recipe!")
return
end
for _, stack in ipairs(data.input) do for _, stack in ipairs(data.input) do
recipe.input[ItemStack(stack):get_name()] = ItemStack(stack):get_count() recipe.input[ItemStack(stack):get_name()] = ItemStack(stack):get_count()
end end
@ -75,6 +80,10 @@ function technic.get_recipe(typename, items)
end end
end end
local index = get_recipe_index(items) local index = get_recipe_index(items)
if not index then
print("[Technic] ignored registration of garbage recipe!")
return
end
local recipe = technic.recipes[typename].recipes[index] local recipe = technic.recipes[typename].recipes[index]
if recipe then if recipe then
local new_input = {} local new_input = {}