Mirrorlandia_minetest/digtron
1
0
Fork 0
mirror of https://github.com/minetest-mods/digtron.git synced 2024-12-22 20:32:22 +01:00
Code Issues Projects Releases Wiki Activity

fix crate protection (#25)

Browse Source 
* fix crate protection

all crates check area protection (minetest.is_protected)
protected crates check area and owner (even if not in protected area)

* separate check and action

* whitespace stuff

* another missing whitespace

* add suggestion from T4im
This commit is contained in:
Thomas Rudin 2018-10-16 01:13:06 +02:00 committed by FaceDeer
parent d3397563ec
commit 1011901938
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nodes/node_crate.lua
View File

@ -77,6 +77,12 @@ local store_digtron = function(pos, clicker, loaded_node_name, protected)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
meta:set_string("crated_layout", layout_string) meta:set_string("crated_layout", layout_string)
if protected then
-- only set owner if protected
meta:set_string("owner", clicker:get_player_name() or "")
end
meta:set_string("title", S("Crated Digtron")) meta:set_string("title", S("Crated Digtron"))
meta:set_string("infotext", S("Crated Digtron") .. "\n" .. protection_suffix) meta:set_string("infotext", S("Crated Digtron") .. "\n" .. protection_suffix)
end end
@ -98,6 +104,10 @@ minetest.register_node("digtron:empty_crate", {
}, },
paramtype = "light", paramtype = "light",
can_dig = function(pos, player)
return player and not minetest.is_protected(pos, player:get_player_name())
end,
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
store_digtron(pos, clicker, "digtron:loaded_crate") store_digtron(pos, clicker, "digtron:loaded_crate")
end end
@ -130,7 +140,7 @@ minetest.register_node("digtron:empty_locked_crate", {
meta:set_string("infotext", S("Digtron Crate") .. "\n" .. S("Owned by @1", placer:get_player_name() or "")) meta:set_string("infotext", S("Digtron Crate") .. "\n" .. S("Owned by @1", placer:get_player_name() or ""))
end, end,
can_dig = function(pos,player) can_dig = function(pos,player)
return player_permitted(pos,player) return player and not minetest.is_protected(pos, player:get_player_name()) and player_permitted(pos, player)
end, end,
on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
if player_permitted(pos,clicker) then if player_permitted(pos,clicker) then
@ -295,9 +305,11 @@ minetest.register_node("digtron:loaded_crate", {
on_receive_fields = function(pos, formname, fields, sender) on_receive_fields = function(pos, formname, fields, sender)
return loaded_on_recieve(pos, fields, sender) return loaded_on_recieve(pos, fields, sender)
end, end,
on_dig = function(pos, node, player) on_dig = function(pos, node, player)
return loaded_on_dig(pos, player, "digtron:loaded_crate") if player and not minetest.is_protected(pos, player:get_player_name()) then
loaded_on_dig(pos, player, "digtron:loaded_crate")
end
end, end,
after_place_node = function(pos, placer, itemstack, pointed_thing) after_place_node = function(pos, placer, itemstack, pointed_thing)
@ -321,7 +333,7 @@ minetest.register_node("digtron:loaded_locked_crate", {
end, end,
on_dig = function(pos, node, player) on_dig = function(pos, node, player)
if player_permitted(pos,player) then if player and not minetest.is_protected(pos, player:get_player_name()) and player_permitted(pos,player) then
return loaded_on_dig(pos, player, "digtron:loaded_locked_crate") return loaded_on_dig(pos, player, "digtron:loaded_locked_crate")
else else
return false return false
@ -352,4 +364,4 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
loaded_on_recieve(pos, fields, player, true) loaded_on_recieve(pos, fields, player, true)
return true return true
end end
end) end)