mff/areas
1
0
Fork 1
forked from minetest-mods/areas
Code Issues Pull Requests Releases Wiki Activity

Fix rename_area and buildable_to nodes on the edges of areas

Browse Source
This commit is contained in:
ShadowNinja 2013-09-03 17:09:11 -04:00
parent 7b0ff512f7
commit b1a4f878ef
3 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
chatcommands.lua
View File

@ -144,14 +144,14 @@ minetest.register_chatcommand("rename_area", {
privs = {}, privs = {},
func = function(name, param) func = function(name, param)
local found, _, id, newName = param:find("^(%d+)%s(.+)$") local found, _, id, newName = param:find("^(%d+)%s(.+)$")
if not found then if not found then
minetest.chat_send_player(name, minetest.chat_send_player(name,
"Invalid usage, see /help rename_area") "Invalid usage, see /help rename_area")
return return
end end
index = areas:getIndexById(tonumber(id)) id = tonumber(id)
index = areas:getIndexById(id)
if not index then if not index then
minetest.chat_send_player(name, "That area doesn't exist.") minetest.chat_send_player(name, "That area doesn't exist.")
@ -165,6 +165,7 @@ minetest.register_chatcommand("rename_area", {
areas.areas[index].name = newName areas.areas[index].name = newName
areas:save() areas:save()
minetest.chat_send_player(name, "Area renamed.")
end}) end})

45
interact.lua
View File

@ -10,30 +10,33 @@ if minetest.can_interact then
old_can_interact = minetest.can_interact old_can_interact = minetest.can_interact
function minetest.can_interact(pos, name) function minetest.can_interact(pos, name)
if not areas:canInteract(pos, name) then if not areas:canInteract(pos, name) then
printWarning(name, pos)
return false return false
end end
return old_can_interact(pos, name) return old_can_interact(pos, name)
end end
else end
local old_node_place = minetest.item_place_node
function minetest.item_place_node(itemstack, placer, pointed_thing) local old_node_place = minetest.item_place_node
-- XXX: buildable_to nodes can mess this up function minetest.item_place_node(itemstack, placer, pointed_thing)
local pos = pointed_thing.above local pos = pointed_thing.above
if not areas:canInteract(pos, placer:get_player_name()) then local ndef = minetest.registered_nodes[pointed_thing.under]
printWarning(placer:get_player_name(), pos) if ndef and ndef.buildable_to then
return itemstack -- Abort place. pos = pointed_thing.under
end end
return old_node_place(itemstack, placer, pointed_thing)
end if not areas:canInteract(pos, placer:get_player_name()) then
printWarning(placer:get_player_name(), pos)
local old_node_dig = minetest.node_dig return itemstack -- Abort place.
function minetest.node_dig(pos, node, digger) end
if not areas:canInteract(pos, digger:get_player_name()) then return old_node_place(itemstack, placer, pointed_thing)
printWarning(digger:get_player_name(), pos) end
return -- Abort dig.
end local old_node_dig = minetest.node_dig
return old_node_dig(pos, node, digger) function minetest.node_dig(pos, node, digger)
end if not areas:canInteract(pos, digger:get_player_name()) then
printWarning(digger:get_player_name(), pos)
return -- Abort dig.
end
return old_node_dig(pos, node, digger)
end end

2
internal.lua
View File

@ -186,7 +186,7 @@ end
-- Checks if a player owns an area or a parent of it -- Checks if a player owns an area or a parent of it
function areas:isAreaOwner(id, name) function areas:isAreaOwner(id, name)
cur = self:getAreaById(id) local cur = self:getAreaById(id)
if cur and minetest.check_player_privs(name, {areas=true}) then if cur and minetest.check_player_privs(name, {areas=true}) then
return true return true
end end