summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVanessa Ezekowitz <vanessaezekowitz@gmail.com>2017-03-18 14:34:18 -0400
committerVanessa Ezekowitz <vanessaezekowitz@gmail.com>2017-03-18 14:37:09 -0400
commitcf186f5f9c829b70ad12a03e58573b7325703503 (patch)
tree9c9e87c1f1a627453ea93535f8a664ef4d65e0bc
parent726bb75e1d0daa36d4c95fb675bc672badad7a77 (diff)
downloadunifieddyes-cf186f5f9c829b70ad12a03e58573b7325703503.tar
unifieddyes-cf186f5f9c829b70ad12a03e58573b7325703503.tar.gz
unifieddyes-cf186f5f9c829b70ad12a03e58573b7325703503.tar.bz2
unifieddyes-cf186f5f9c829b70ad12a03e58573b7325703503.tar.xz
unifieddyes-cf186f5f9c829b70ad12a03e58573b7325703503.zip
make sure the pointed thing is a node before checking protection
-rw-r--r--init.lua13
1 files changed, 7 insertions, 6 deletions
diff --git a/init.lua b/init.lua
index 379f641..47faf46 100644
--- a/init.lua
+++ b/init.lua
@@ -561,13 +561,14 @@ function unifieddyes.after_dig_node(pos, oldnode, oldmetadata, digger)
end
function unifieddyes.on_use(itemstack, player, pointed_thing)
-
local playername = player:get_player_name()
- if minetest.is_protected(unifieddyes.select_node(pointed_thing), playername)
- and not minetest.check_player_privs(playername, "protection_bypass") then
- minetest.chat_send_player(playername, "Sorry, someone else owns that spot.")
- return
+ if pointed_thing and pointed_thing.type == "node" then
+ if minetest.is_protected(unifieddyes.select_node(pointed_thing), playername)
+ and not minetest.check_player_privs(playername, "protection_bypass") then
+ minetest.chat_send_player(playername, "Sorry, someone else owns that spot.")
+ return
+ end
end
if pointed_thing and pointed_thing.type == "object" then
@@ -575,7 +576,7 @@ function unifieddyes.on_use(itemstack, player, pointed_thing)
return player:get_wielded_item() -- punch may modified the wielded item, load the new and return it
end
- if not (pointed_thing and pointed_thing.type == "node") then return end -- if "using" the dye not on a node
+ if not (pointed_thing and pointed_thing.type == "node") then return end -- if "using" the dye on nothing at all (e.g. air)
local pos = minetest.get_pointed_thing_position(pointed_thing)
local node = minetest.get_node(pos)