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

Fixed missing check for ownership/node protection in lights

Browse Source 
made lights check for buildable_to instead of just air
This commit is contained in:
Vanessa Ezekowitz 2013-06-07 14:11:42 -04:00
parent 1e6ba1103b
commit cf717ce73f
1 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lighting.lua
View File

@ -14,37 +14,50 @@ local dirs1 = { 20, 23, 22, 21 }
local dirs2 = { 9, 18, 7, 12 } local dirs2 = { 9, 18, 7, 12 }
function homedecor_rotate_and_place(itemstack, placer, pointed_thing) function homedecor_rotate_and_place(itemstack, placer, pointed_thing)
if not homedecor_node_is_owned(pointed_thing.under, placer)
and not homedecor_node_is_owned(pointed_thing.above, placer) then
local node = minetest.env:get_node(pointed_thing.under) local node = minetest.env:get_node(pointed_thing.under)
if not minetest.registered_nodes[node.name] or not minetest.registered_nodes[node.name].on_rightclick then if not minetest.registered_nodes[node.name] or not minetest.registered_nodes[node.name].on_rightclick then
local above = pointed_thing.above local above = pointed_thing.above
local under = pointed_thing.under local under = pointed_thing.under
local pitch = placer:get_look_pitch() local pitch = placer:get_look_pitch()
local pname = minetest.env:get_node(under).name
local node = minetest.env:get_node(above) local node = minetest.env:get_node(above)
local fdir = minetest.dir_to_facedir(placer:get_look_dir()) local fdir = minetest.dir_to_facedir(placer:get_look_dir())
local wield_name = itemstack:get_name() local wield_name = itemstack:get_name()
if node.name ~= "air" then return end if not minetest.registered_nodes[pname]
or not minetest.registered_nodes[pname].on_rightclick then
local iswall = (above.x ~= under.x) or (above.z ~= under.z) local iswall = (above.x ~= under.x) or (above.z ~= under.z)
local isceiling = (above.x == under.x) and (above.z == under.z) and (pitch > 0) local isceiling = (above.x == under.x) and (above.z == under.z) and (pitch > 0)
local pos1 = above
if minetest.registered_nodes[pname]["buildable_to"] then
pos1 = under
iswall = false
end
if not minetest.registered_nodes[minetest.env:get_node(pos1).name]["buildable_to"] then return end
if iswall then if iswall then
minetest.env:add_node(above, {name = wield_name, param2 = dirs2[fdir+1] }) -- place wall variant minetest.env:add_node(pos1, {name = wield_name, param2 = dirs2[fdir+1] }) -- place wall variant
elseif isceiling then elseif isceiling then
minetest.env:add_node(above, {name = wield_name, param2 = 20 }) -- place upside down variant minetest.env:add_node(pos1, {name = wield_name, param2 = 20 }) -- place upside down variant
else else
minetest.env:add_node(above, {name = wield_name, param2 = 0 }) -- place right side up minetest.env:add_node(pos1, {name = wield_name, param2 = 0 }) -- place right side up
end end
if not homedecor_expect_infinite_stacks then if not homedecor_expect_infinite_stacks then
itemstack:take_item() itemstack:take_item()
return itemstack return itemstack
end end
end
else else
minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, placer, itemstack) minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, placer, itemstack)
end end
end
end end
local colors = {"yellow","white"} local colors = {"yellow","white"}