Introduce "protection_bypass" privilege.

This privilege allows map protection bypassing for server operators
and world moderators.

Initially I had thought that bypassing protection mods would have been
something that could entirely be done inside mods and minetest_game,
but the concept of protection is defined in core, in the code of
core.is_protected().

I don't feel that it would be logical to introduce a protection
concept in core, but not some way around that for server operators
to maintain map parts that need fixing, de-griefing or cleanup.

Others had noticed the same problems, and proposed a patch to
minetest_game. That patch is fine by itself, but it fails to add
protection bypass functionality for digging normal nodes and placing
nodes.

So, instead, we indroduce the new priv "protection_bypass" in core,
and modify 'on_place_node' and 'node_dig' to allow bypassing node
protections if the player holds this priv.

This priv was tested with protector redo by tenplus1.

A followup patch to Minetest Game will include allowing special checks
for doors, trapdoors, chests in Minetest Game.

Protection mods will likely want to mimic the changes in their relevant
code sections.

diff --git a/builtin/game/item.lua b/builtin/game/item.lua
index c42aff5b0c0f62507608653f3c6c39e764f3c51f..36c2c1a68cbb71e40420d8c07c9dd5e779540b62 100644 (file)
--- a/builtin/game/item.lua
+++ b/builtin/game/item.lua
@@ -233,7 +233,8 @@ function core.item_place_node(itemstack, placer, pointed_thing, param2)
                place_to = {x = under.x, y = under.y, z = under.z}
        end
 
-       if core.is_protected(place_to, placer:get_player_name()) then
+       if core.is_protected(place_to, placer:get_player_name()) and
+                       not minetest.check_player_privs(placer, "protection_bypass") then
                core.log("action", placer:get_player_name()
                                .. " tried to place " .. def.name
                                .. " at protected position "
@@ -444,7 +445,8 @@ function core.node_dig(pos, node, digger)
                return
        end
 
-       if core.is_protected(pos, digger:get_player_name()) then
+       if core.is_protected(pos, digger:get_player_name()) and
+                       not minetest.check_player_privs(digger, "protection_bypass") then
                core.log("action", digger:get_player_name()
                                .. " tried to dig " .. node.name
                                .. " at protected position "

diff --git a/builtin/game/privileges.lua b/builtin/game/privileges.lua
index 7e6387c7229cb50e4c0fc5939dd1be3ba212156f..bd5ead62400e39ec2e4aa2252c5c5e5414cc086d 100644 (file)
--- a/builtin/game/privileges.lua
+++ b/builtin/game/privileges.lua
@@ -32,6 +32,7 @@ core.register_privilege("settime", "Can use /time")
 core.register_privilege("privs", "Can modify privileges")
 core.register_privilege("basic_privs", "Can modify 'shout' and 'interact' privileges")
 core.register_privilege("server", "Can do server maintenance stuff")
+core.register_privilege("protection_bypass", "Can bypass node protection in the world")
 core.register_privilege("shout", "Can speak in chat")
 core.register_privilege("ban", "Can ban and unban players")
 core.register_privilege("kick", "Can kick players")