minetest-mirrors/easyvend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash when an item becomes unknown

Browse Source
This commit is contained in:
Wuzzy 2017-01-12 15:27:54 +01:00
parent 242fd04039
commit 6ca234b50e
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
easyvend.lua
View File

@ -486,7 +486,12 @@ easyvend.make_infotext = function(nodename, owner, cost, number, itemstring)
end end
return d return d
end end
local iname = minetest.registered_items[itemstring].description local iname
if minetest.registered_items[itemstring] then
iname = minetest.registered_items[itemstring].description
else
iname = string.format("Unknown Item (%s)", itemstring)
end
if iname == nil then iname = itemstring end if iname == nil then iname = itemstring end
local printitem, printcost local printitem, printcost
if number == 1 then if number == 1 then
@ -1145,7 +1150,7 @@ easyvend.find_chest = function(owner, pos, dy, itemname, check_wear, amount, rem
end end
local inv = meta:get_inventory() local inv = meta:get_inventory()
if (inv ~= nil) then if (inv ~= nil) then
if (itemname ~= nil and amount ~= nil and removing ~= nil and check_wear ~= nil) then if (itemname ~= nil and minetest.registered_items[itemname] and amount ~= nil and removing ~= nil and check_wear ~= nil) then
local chest_has, chest_free local chest_has, chest_free
local stack = {name=itemname, count=amount, wear=0, metadata=""} local stack = {name=itemname, count=amount, wear=0, metadata=""}
local stack_max = minetest.registered_items[itemname].stack_max local stack_max = minetest.registered_items[itemname].stack_max
@ -1169,7 +1174,11 @@ easyvend.find_chest = function(owner, pos, dy, itemname, check_wear, amount, rem
else else
return pos, internal return pos, internal
end end
else
return nil, internal
end end
else
return nil, internal
end end
elseif (node.name ~= "easyvend:vendor" and node.name~="easyvend:depositor" and node.name~="easyvend:vendor_on" and node.name~="easyvend:depositor_on") then elseif (node.name ~= "easyvend:vendor" and node.name~="easyvend:depositor" and node.name~="easyvend:vendor_on" and node.name~="easyvend:depositor_on") then
return nil, internal return nil, internal