mff/homedecor_modpack
1
0
Fork 0
forked from mtcontrib/homedecor_modpack
Code Issues Pull Requests Releases Wiki Activity

add sanity check to avoid cases in which expanded items would be placed against unknown nodes into other unknown nodes as pointed_think.above node

Browse Source 
this resolves #205
This commit is contained in:
Tim 2015-03-03 18:10:53 +01:00
parent f96e890155
commit db703e555d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
homedecor/handlers/expansion.lua
View File

@ -50,6 +50,8 @@ end
-- leave the last argument nil if it's one 2m high node -- leave the last argument nil if it's one 2m high node
function homedecor.stack_vertically(itemstack, placer, pointed_thing, node1, node2) function homedecor.stack_vertically(itemstack, placer, pointed_thing, node1, node2)
local pos, def = select_node(pointed_thing) local pos, def = select_node(pointed_thing)
if not def then return end -- rare corner case, but happened in #205
if def.on_rightclick then if def.on_rightclick then
return def.on_rightclick(pointed_thing.under, minetest.get_node(pos), placer, itemstack) return def.on_rightclick(pointed_thing.under, minetest.get_node(pos), placer, itemstack)
end end
@ -69,6 +71,8 @@ local fdir_to_left = {
} }
function homedecor.stack_wing(itemstack, placer, pointed_thing, node1, node2, node1_right, node2_right) function homedecor.stack_wing(itemstack, placer, pointed_thing, node1, node2, node1_right, node2_right)
local pos, def = select_node(pointed_thing) local pos, def = select_node(pointed_thing)
if not def then return end -- rare corner case, but happened in #205
if def.on_rightclick then if def.on_rightclick then
return def.on_rightclick(pointed_thing.under, minetest.get_node(pos), placer, itemstack) return def.on_rightclick(pointed_thing.under, minetest.get_node(pos), placer, itemstack)
end end
@ -102,6 +106,8 @@ homedecor.fdir_to_fwd = {
function homedecor.stack_sideways(itemstack, placer, pointed_thing, node1, node2, dir) function homedecor.stack_sideways(itemstack, placer, pointed_thing, node1, node2, dir)
local pos, def = select_node(pointed_thing) local pos, def = select_node(pointed_thing)
if not def then return end -- rare corner case, but happened in #205
if def.on_rightclick then if def.on_rightclick then
return def.on_rightclick(pointed_thing.under, minetest.get_node(pos), placer, itemstack) return def.on_rightclick(pointed_thing.under, minetest.get_node(pos), placer, itemstack)
end end