Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity

Fix rightclick handling of mcl_paintings

objects
Wuzzy 2017-07-27 17:50:46 +02:00
parent bad4b2a4d3
commit db1d272602
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mods/ENTITIES/mcl_paintings/init.lua
View File

@ -16,10 +16,12 @@ minetest.register_craftitem("mcl_paintings:painting", {
local under = pointed_thing.under local under = pointed_thing.under
local above = pointed_thing.above local above = pointed_thing.above
-- Am I right-clicking on something that has a custom on_rightclick set?
-- Use pointed node's on_rightclick function first, if present
local node_under = minetest.get_node(under)
if placer and not placer:get_player_control().sneak then if placer and not placer:get_player_control().sneak then
if minetest.registered_nodes[under.name] and minetest.registered_nodes[under.name].on_rightclick then if minetest.registered_nodes[node_under.name] and minetest.registered_nodes[node_under.name].on_rightclick then
return minetest.registered_nodes[under.name].on_rightclick(pointed_thing.under, under, placer, itemstack) or itemstack return minetest.registered_nodes[node_under.name].on_rightclick(under, node_under, placer, itemstack) or itemstack
end end
end end
@ -28,8 +30,7 @@ minetest.register_craftitem("mcl_paintings:painting", {
return itemstack return itemstack
end end
-- Can only be placed on solid nodes -- Can only be placed on solid nodes
local undernode = minetest.get_node(under) if minetest.get_item_group(node_under.name, "solid") == 0 then
if minetest.get_item_group(undernode.name, "solid") == 0 then
return itemstack return itemstack
end end