Wuzzy/hades_revisited
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve protection check for doors+itemshow nodes

Browse Source
This commit is contained in:
Wuzzy 2021-08-14 14:17:07 +02:00
parent d63511c596
commit aa86928e51
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mods/doors/api.lua
View File

@ -283,7 +283,11 @@ function doors.register(name, def)
end end
local pn = placer:get_player_name() local pn = placer:get_player_name()
if minetest.is_protected(pos, pn) or minetest.is_protected(above, pn) then if minetest.is_protected(pos, pn) then
minetest.record_protection_violation(pos, pn)
return itemstack
elseif minetest.is_protected(above, pn) then
minetest.record_protection_violation(above, pn)
return itemstack return itemstack
end end

14
mods/hades_itemshow/init.lua
View File

@ -109,10 +109,14 @@ end
local on_rightclick = function(pos, node, clicker, itemstack) local on_rightclick = function(pos, node, clicker, itemstack)
if not itemstack then return end if not itemstack then return end
if minetest.is_protected(pos, clicker:get_player_name()) then return end local name = clicker:get_player_name()
if minetest.is_protected(pos, name) then
minetest.record_protection_violation(pos, name)
return itemstack
end
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()
local creative = minetest.is_creative_enabled(clicker:get_player_name()) local creative = minetest.is_creative_enabled(name)
if not inv:get_stack("main", 1):is_empty() then if not inv:get_stack("main", 1):is_empty() then
drop_item(pos, node, creative) drop_item(pos, node, creative)
else else
@ -445,7 +449,11 @@ minetest.register_node("hades_itemshow:"..name,{
end end
local pn = placer:get_player_name() local pn = placer:get_player_name()
if minetest.is_protected(pos, pn) or minetest.is_protected(above, pn) then if minetest.is_protected(pos, pn) then
minetest.record_protection_violation(pos, pn)
return itemstack
elseif minetest.is_protected(above, pn) then
minetest.record_protection_violation(above, pn)
return itemstack return itemstack
end end