Merge remote-tracking branch 'upstream/master'

This commit is contained in:
2020-12-15 23:26:54 +01:00
5 changed files with 60 additions and 4 deletions

View File

@ -13,6 +13,16 @@ local default_size = tonumber(minetest.settings:get("mapfix_default_size")) or 2
local max_size = tonumber(minetest.settings:get("mapfix_max_size")) or 32
local delay = tonumber(minetest.settings:get("mapfix_delay")) or 15
local function mapfix_priv()
local priv = minetest.settings:get("mapfix_priv")
if not minetest.registered_privileges[priv] then
return "server"
else
return priv
end
end
minetest.register_chatcommand("mapfix", {
params = "<size>",
description = "Recalculate the flowing liquids and the light of a chunk",
@ -23,21 +33,24 @@ minetest.register_chatcommand("mapfix", {
if size >= 121 then
return false, "Radius is too big"
end
local privs = minetest.check_player_privs(name, {server=true})
local privs = minetest.check_player_privs(name, mapfix_priv())
local time = os.time()
if not privs then
if size > max_size then
return false, "You need the server privilege to exceed the radius of " .. max_size .. " blocks"
return false, "You need the " .. mapfix_priv() .. " privilege to exceed the radius of " .. max_size .. " blocks"
elseif time - previous < delay then
return false, "Wait at least " .. delay .. " seconds from the previous \"/mapfix\"."
end
previous = time
end
minetest.log("action", name .. " uses mapfix at " .. minetest.pos_to_string(vector.round(pos)) .. " with radius " .. size)
minetest.log("action",
name .. " uses mapfix at " .. minetest.pos_to_string(vector.round(pos)) .. " with radius " .. size)
size = math.max(math.floor(size - 8), 0) -- When passed to get_voxel_manip, positions are rounded up, to a multiple of 16 nodes in each direction. By subtracting 8 it's rounded to the nearest chunk border. max is used to avoid negative radius.
-- When passed to get_voxel_manip, positions are rounded up, to a multiple of 16 nodes in each direction.
-- By subtracting 8 it's rounded to the nearest chunk border. max is used to avoid negative radius.
size = math.max(math.floor(size - 8), 0)
local minp = vector.subtract(pos, size)
local maxp = vector.add(pos, size)