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

fix broken check-for-colorable

Browse Source
This commit is contained in:
Vanessa Ezekowitz 2017-02-05 20:21:04 -05:00
parent e981b29cd2
commit e3b7e9d534
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
init.lua
View File

@ -296,6 +296,7 @@ function unifieddyes.on_use(itemstack, player, pointed_thing)
local pos = minetest.get_pointed_thing_position(pointed_thing) local pos = minetest.get_pointed_thing_position(pointed_thing)
local node = minetest.get_node(pos) local node = minetest.get_node(pos)
local nodedef = minetest.registered_nodes[node.name] local nodedef = minetest.registered_nodes[node.name]
local playername = player:get_player_name()
-- if the node has an on_punch defined, bail out and call that instead. -- if the node has an on_punch defined, bail out and call that instead.
local onpunch = nodedef.on_punch(pos, node, player, pointed_thing) local onpunch = nodedef.on_punch(pos, node, player, pointed_thing)
@ -304,7 +305,10 @@ function unifieddyes.on_use(itemstack, player, pointed_thing)
end end
-- if the target is unknown, has no groups defined, or isn't UD-colorable, just bail out -- if the target is unknown, has no groups defined, or isn't UD-colorable, just bail out
if not (nodedef and nodedef.groups and nodedef.groups.ud_param2_colorable) then return end if not (nodedef and nodedef.groups and nodedef.groups.ud_param2_colorable) then
minetest.chat_send_player(playername, "That node can't be colored.")
return
end
local newnode = nodedef.ud_replacement_node local newnode = nodedef.ud_replacement_node
local is_color_fdir local is_color_fdir
@ -317,13 +321,6 @@ function unifieddyes.on_use(itemstack, player, pointed_thing)
then is_color_fdir = "wallmounted" then is_color_fdir = "wallmounted"
end end
local playername = player:get_player_name()
if is_color_fdir == nil then -- target node doesn't support coloring at all.
minetest.chat_send_player(playername, "That node can't be colored.")
return
end
if minetest.is_protected(pos, playername) and not minetest.check_player_privs(playername, {protection_bypass=true}) then if minetest.is_protected(pos, playername) and not minetest.check_player_privs(playername, {protection_bypass=true}) then
minetest.record_protection_violation(pos, playername) minetest.record_protection_violation(pos, playername)
return return