mtcontrib/factions
1
0
Fork 2
Code Issues Releases Wiki Activity

faction: protect can be bypassed now

Browse Source
This commit is contained in:
Coder12a 2019-06-28 15:49:42 -05:00
parent d00c120cd5
commit e962c88309
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nodes.lua
View File

@ -40,7 +40,7 @@ if minetest.registered_nodes["default:chest"] then
if def_allow_metadata_inventory_move then if def_allow_metadata_inventory_move then
allow_metadata_inventory_move = function(pos, from_list, from_index, allow_metadata_inventory_move = function(pos, from_list, from_index,
to_list, to_index, count, player) to_list, to_index, count, player)
if not factions.can_use_node(pos, player:get_player_name(), "container") then if not factions.can_use_node(pos, player:get_player_name(), "container") and not minetest.check_player_privs(player, "protection_bypass") then
return 0 return 0
end end
return def_allow_metadata_inventory_move(pos, from_list, from_index, to_list, to_index, count, player) return def_allow_metadata_inventory_move(pos, from_list, from_index, to_list, to_index, count, player)
@ -48,7 +48,7 @@ if minetest.registered_nodes["default:chest"] then
else else
allow_metadata_inventory_move = function(pos, from_list, from_index, allow_metadata_inventory_move = function(pos, from_list, from_index,
to_list, to_index, count, player) to_list, to_index, count, player)
if not factions.can_use_node(pos, player:get_player_name(), "container") then if not factions.can_use_node(pos, player:get_player_name(), "container") and not minetest.check_player_privs(player, "protection_bypass") then
return 0 return 0
end end
return count return count
@ -59,14 +59,14 @@ if minetest.registered_nodes["default:chest"] then
local def_allow_metadata_inventory_put = dc.allow_metadata_inventory_put local def_allow_metadata_inventory_put = dc.allow_metadata_inventory_put
if def_allow_metadata_inventory_put then if def_allow_metadata_inventory_put then
allow_metadata_inventory_put = function(pos, listname, index, stack, player) allow_metadata_inventory_put = function(pos, listname, index, stack, player)
if not factions.can_use_node(pos, player:get_player_name(), "container") then if not factions.can_use_node(pos, player:get_player_name(), "container") and not minetest.check_player_privs(player, "protection_bypass") then
return 0 return 0
end end
return def_allow_metadata_inventory_put(pos, listname, index, stack, player) return def_allow_metadata_inventory_put(pos, listname, index, stack, player)
end end
else else
allow_metadata_inventory_put = function(pos, listname, index, stack, player) allow_metadata_inventory_put = function(pos, listname, index, stack, player)
if not factions.can_use_node(pos, player:get_player_name(), "container") then if not factions.can_use_node(pos, player:get_player_name(), "container") and not minetest.check_player_privs(player, "protection_bypass") then
return 0 return 0
end end
return stack:get_count() return stack:get_count()
@ -77,14 +77,14 @@ if minetest.registered_nodes["default:chest"] then
local def_allow_metadata_inventory_take = dc.allow_metadata_inventory_take local def_allow_metadata_inventory_take = dc.allow_metadata_inventory_take
if def_allow_metadata_inventory_take then if def_allow_metadata_inventory_take then
allow_metadata_inventory_take = function(pos, listname, index, stack, player) allow_metadata_inventory_take = function(pos, listname, index, stack, player)
if not factions.can_use_node(pos, player:get_player_name(), "container") then if not factions.can_use_node(pos, player:get_player_name(), "container") and not minetest.check_player_privs(player, "protection_bypass") then
return 0 return 0
end end
return def_allow_metadata_inventory_take(pos, listname, index, stack, player) return def_allow_metadata_inventory_take(pos, listname, index, stack, player)
end end
else else
allow_metadata_inventory_take = function(pos, listname, index, stack, player) allow_metadata_inventory_take = function(pos, listname, index, stack, player)
if not factions.can_use_node(pos, player:get_player_name(), "container") then if not factions.can_use_node(pos, player:get_player_name(), "container") and not minetest.check_player_privs(player, "protection_bypass") then
return 0 return 0
end end
return stack:get_count() return stack:get_count()
@ -92,7 +92,7 @@ if minetest.registered_nodes["default:chest"] then
end end
local on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) local on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
if not factions.can_use_node(pos, clicker:get_player_name(), "container") then if not factions.can_use_node(pos, clicker:get_player_name(), "container") and not minetest.check_player_privs(clicker, "protection_bypass") then
return itemstack return itemstack
end end
return def_on_rightclick(pos, node, clicker, itemstack, pointed_thing) return def_on_rightclick(pos, node, clicker, itemstack, pointed_thing)
@ -151,7 +151,7 @@ for i, l in ipairs(doors) do
local def_can_dig = dw.can_dig local def_can_dig = dw.can_dig
local on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) local on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
if factions.can_use_node(pos, clicker:get_player_name(), "door") then if factions.can_use_node(pos, clicker:get_player_name(), "door") or minetest.check_player_privs(clicker, "protection_bypass") then
def_on_rightclick(pos, node, clicker, itemstack, pointed_thing) def_on_rightclick(pos, node, clicker, itemstack, pointed_thing)
end end
return itemstack return itemstack

4
protection_override.lua
View File

@ -1,6 +1,10 @@
local default_is_protected = minetest.is_protected local default_is_protected = minetest.is_protected
minetest.is_protected = function(pos, player) minetest.is_protected = function(pos, player)
if minetest.check_player_privs(player, "protection_bypass") then
return default_is_protected(pos, player)
end
local y = pos.y local y = pos.y
if factions_config.protection_depth_height_limit and (pos.y < factions_config.protection_max_depth or pos.y > factions_config.protection_max_height) then if factions_config.protection_depth_height_limit and (pos.y < factions_config.protection_max_depth or pos.y > factions_config.protection_max_height) then