Fix leaking {safe,check}_region

diff --git a/worldedit_commands/init.lua b/worldedit_commands/init.lua
index 692b0ece30fce73a09bd436713b53780ce003de0..0fa8e389da26dce29f77fccb763553c4ed1f8096 100644 (file)
--- a/worldedit_commands/init.lua
+++ b/worldedit_commands/init.lua
@@ -11,8 +11,7 @@ if minetest.place_schematic then
 end\r
 \r
 dofile(minetest.get_modpath("worldedit_commands") .. "/mark.lua")\r
-dofile(minetest.get_modpath("worldedit_commands") .. "/safe.lua")\r
-safe_region = rawget(_G, "safe_region") or function(callback) return callback end\r
+local safe_region, check_region = dofile(minetest.get_modpath("worldedit_commands") .. "/safe.lua")\r
 \r
 local function get_position(name) --position 1 retrieval function for when not using `safe_region`\r
        local pos1 = worldedit.pos1[name]\r

diff --git a/worldedit_commands/safe.lua b/worldedit_commands/safe.lua
index c6751c13eb96e4ddb4356ab6d6bb218d21e5e3ad..e640853fa425f73de7184d5ef04f9c4d14846f33 100644 (file)
--- a/worldedit_commands/safe.lua
+++ b/worldedit_commands/safe.lua
@@ -1,7 +1,7 @@
 local safe_region_callback = {}\r
 local safe_region_param = {}\r
 \r
-check_region = function(name, param)\r
+local function check_region(name, param)\r
        local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name] --obtain positions\r
        if pos1 == nil or pos2 == nil then\r
                worldedit.player_notify(name, "no region selected")\r
@@ -12,7 +12,7 @@ end
 \r
 --`callback` is a callback to run when the user confirms\r
 --`nodes_needed` is a function accepting `param`, `pos1`, and `pos2` to calculate the number of nodes needed\r
-safe_region = function(callback, nodes_needed)\r
+local function safe_region(callback, nodes_needed)\r
        --default node volume calculation\r
        nodes_needed = nodes_needed or check_region\r
 \r
@@ -63,3 +63,6 @@ minetest.register_chatcommand("/n", {
                safe_region_callback[name], safe_region_param[name] = nil, nil\r
        end,\r
 })\r
+\r
+return safe_region, check_region\r
+\r