Wuzzy/repixture-cd2025
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix protection check issues with torch and signs

Browse Source
This commit is contained in:
Wuzzy 2024-05-05 11:45:49 +02:00
parent 344c8cefd8
commit 1f29178472
2 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mods/rp_default/torch.lua
View File

@ -58,6 +58,7 @@ local function register_torch(subname, description, tt_help, tiles, overlay_tile
return itemstack
end
local under = pointed_thing.under
local above = pointed_thing.above
local node = minetest.get_node(under)
local def = minetest.registered_nodes[node.name]
if def and def.on_rightclick and
@ -66,10 +67,17 @@ local function register_torch(subname, description, tt_help, tiles, overlay_tile
return def.on_rightclick(under, node, placer, itemstack, pointed_thing) or itemstack
end
local above = pointed_thing.above
if minetest.is_protected(above, placer:get_player_name()) and
local nodedef = minetest.registered_nodes[node.name]
local buildable_to = nodedef and nodedef.buildable_to
local protcheck
if buildable_to then
protcheck = under
else
protcheck = above
end
if minetest.is_protected(protcheck, placer:get_player_name()) and
not minetest.check_player_privs(placer, "protection_bypass") then
minetest.record_protection_violation(above, placer:get_player_name())
minetest.record_protection_violation(protcheck, placer:get_player_name())
return itemstack
end

32
mods/rp_signs/init.lua
View File

@ -781,6 +781,20 @@ local function register_sign(id, def)
pointed_thing) or itemstack
end
local nodedef = minetest.registered_nodes[node.name]
local buildable_to = nodedef and nodedef.buildable_to
local protcheck
if buildable_to then
protcheck = pointed_thing.under
else
protcheck = pointed_thing.above
end
if minetest.is_protected(protcheck, placer:get_player_name()) and
not minetest.check_player_privs(placer, "protection_bypass") then
minetest.record_protection_violation(protcheck, placer:get_player_name())
return itemstack
end
local check_r90 = function(yaw)
if (yaw > (1/4)*math.pi and yaw < (3/4)*math.pi) or (yaw > (5/4)*math.pi and yaw < (7/4)*math.pi) then
return true
@ -929,6 +943,21 @@ local function register_sign(id, def)
pointed_thing) or itemstack
end
local nodedef = minetest.registered_nodes[node.name]
local buildable_to = nodedef and nodedef.buildable_to
local protcheck
if buildable_to then
protcheck = pointed_thing.under
else
protcheck = pointed_thing.above
end
if minetest.is_protected(protcheck, placer:get_player_name()) and
not minetest.check_player_privs(placer, "protection_bypass") then
minetest.record_protection_violation(protcheck, placer:get_player_name())
return itemstack
end
local fakestack = ItemStack(itemstack)
local dir = vector.subtract(pointed_thing.under, pointed_thing.above)
local p2
@ -941,12 +970,11 @@ local function register_sign(id, def)
else
-- When placing sideways, the sign may either
-- become a sideways sign, or standing.
local nodedef = minetest.registered_nodes[node.name]
local stand = false
-- If targeted node is buildable_to and floor is
-- walkable, it becomes a standing sign because
-- that's what the player probably meant.
if nodedef and nodedef.buildable_to then
if buildable_to then
local below = vector.offset(pointed_thing.under, 0, -1, 0)
local node_below = minetest.get_node(below)
local nodedef_below = minetest.registered_nodes[node_below.name]