Prevent auto-rotated nodes replacing the nodes they are placed on
ShadowNinja
parent
78f7f9eca8
commit
811ea6cfc0
|
|
@ -264,78 +264,86 @@ end
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
|
|
||||||
if minetest then
|
if minetest then
|
||||||
local dirs1 = { 9, 18, 7, 12 }
|
local dirs1 = {9, 18, 7, 12}
|
||||||
local dirs2 = { 20, 23, 22, 21 }
|
local dirs2 = {20, 23, 22, 21}
|
||||||
|
|
||||||
function minetest.rotate_and_place(itemstack, placer, pointed_thing, infinitestacks, orient_flags)
|
function minetest.rotate_and_place(itemstack, placer, pointed_thing,
|
||||||
|
infinitestacks, orient_flags)
|
||||||
orient_flags = orient_flags or {}
|
orient_flags = orient_flags or {}
|
||||||
|
|
||||||
local node = minetest.get_node(pointed_thing.under)
|
local unode = minetest.get_node_or_nil(pointed_thing.under)
|
||||||
if not minetest.registered_nodes[node.name]
|
if not unode then
|
||||||
or not minetest.registered_nodes[node.name].on_rightclick then
|
return
|
||||||
|
end
|
||||||
|
local undef = minetest.registered_nodes[unode.name]
|
||||||
|
if undef and undef.on_rightclick then
|
||||||
|
undef.on_rightclick(pointed_thing.under, node, placer,
|
||||||
|
itemstack)
|
||||||
|
return
|
||||||
|
end
|
||||||
|
local pitch = placer:get_look_pitch()
|
||||||
|
local fdir = minetest.dir_to_facedir(placer:get_look_dir())
|
||||||
|
local wield_name = itemstack:get_name()
|
||||||
|
|
||||||
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 iswall = (above.y == under.y)
|
||||||
local pname = minetest.get_node(under).name
|
local isceiling = not iswall and (above.y < under.y)
|
||||||
local node = minetest.get_node(above)
|
local anode = minetest.get_node_or_nil(above)
|
||||||
local fdir = minetest.dir_to_facedir(placer:get_look_dir())
|
if not anode then
|
||||||
local wield_name = itemstack:get_name()
|
return
|
||||||
local reg_node = minetest.registered_nodes[pname]
|
end
|
||||||
|
local pos = pointed_thing.above
|
||||||
|
local node = anode
|
||||||
|
|
||||||
if not reg_node or not reg_node.on_rightclick then
|
if undef and undef.buildable_to then
|
||||||
|
pos = pointed_thing.under
|
||||||
|
node = unode
|
||||||
|
iswall = false
|
||||||
|
end
|
||||||
|
|
||||||
local iswall = (above.x ~= under.x) or (above.z ~= under.z)
|
local ndef = minetest.registered_nodes[node.name]
|
||||||
local isceiling = (above.x == under.x) and (above.z == under.z)
|
if not ndef or not ndef.buildable_to then
|
||||||
and (pitch > 0)
|
return
|
||||||
local pos1 = above
|
end
|
||||||
|
|
||||||
if reg_node and reg_node.buildable_to then
|
if orient_flags.force_floor then
|
||||||
pos1 = under
|
iswall = false
|
||||||
iswall = false
|
isceiling = false
|
||||||
end
|
elseif orient_flags.force_ceiling then
|
||||||
|
iswall = false
|
||||||
|
isceiling = true
|
||||||
|
elseif orient_flags.force_wall then
|
||||||
|
iswall = true
|
||||||
|
isceiling = false
|
||||||
|
elseif orient_flags.invert_wall then
|
||||||
|
iswall = not iswall
|
||||||
|
end
|
||||||
|
|
||||||
reg_node = minetest.registered_nodes[minetest.get_node(pos1).name]
|
if iswall then
|
||||||
if not reg_node or not reg_node.buildable_to then
|
minetest.set_node(pos, {name = wield_name,
|
||||||
return
|
param2 = dirs1[fdir+1]})
|
||||||
end
|
elseif isceiling then
|
||||||
|
if orient_flags.force_facedir then
|
||||||
if orient_flags.force_floor then
|
minetest.set_node(pos, {name = wield_name,
|
||||||
iswall = false
|
param2 = 20})
|
||||||
isceiling = false
|
else
|
||||||
elseif orient_flags.force_ceiling then
|
minetest.set_node(pos, {name = wield_name,
|
||||||
iswall = false
|
param2 = dirs2[fdir+1]})
|
||||||
isceiling = true
|
|
||||||
elseif orient_flags.force_wall then
|
|
||||||
iswall = true
|
|
||||||
isceiling = false
|
|
||||||
elseif orient_flags.invert_wall then
|
|
||||||
iswall = not iswall
|
|
||||||
end
|
|
||||||
|
|
||||||
if iswall then
|
|
||||||
minetest.add_node(pos1, {name = wield_name, param2 = dirs1[fdir+1] })
|
|
||||||
elseif isceiling then
|
|
||||||
if orient_flags.force_facedir then
|
|
||||||
minetest.add_node(pos1, {name = wield_name, param2 = 20 })
|
|
||||||
else
|
|
||||||
minetest.add_node(pos1, {name = wield_name, param2 = dirs2[fdir+1] })
|
|
||||||
end
|
|
||||||
else -- place right side up
|
|
||||||
if orient_flags.force_facedir then
|
|
||||||
minetest.add_node(pos1, {name = wield_name, param2 = 0 })
|
|
||||||
else
|
|
||||||
minetest.add_node(pos1, {name = wield_name, param2 = fdir })
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
if not infinitestacks then
|
|
||||||
itemstack:take_item()
|
|
||||||
return itemstack
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
else
|
else -- place right side up
|
||||||
minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, placer, itemstack)
|
if orient_flags.force_facedir then
|
||||||
|
minetest.set_node(pos, {name = wield_name,
|
||||||
|
param2 = 0})
|
||||||
|
else
|
||||||
|
minetest.set_node(pos, {name = wield_name,
|
||||||
|
param2 = fdir})
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
if not infinitestacks then
|
||||||
|
itemstack:take_item()
|
||||||
|
return itemstack
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -348,8 +356,8 @@ if minetest then
|
||||||
|
|
||||||
minetest.rotate_node = function(itemstack, placer, pointed_thing)
|
minetest.rotate_node = function(itemstack, placer, pointed_thing)
|
||||||
minetest.rotate_and_place(itemstack, placer, pointed_thing,
|
minetest.rotate_and_place(itemstack, placer, pointed_thing,
|
||||||
minetest.setting_getbool("creative_mode"),
|
minetest.setting_getbool("creative_mode"),
|
||||||
{invert_wall = placer:get_player_control().sneak})
|
{invert_wall = placer:get_player_control().sneak})
|
||||||
return itemstack
|
return itemstack
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue