Skip to content

Commit 163dffc

Browse files
committedMay 16, 2015
Fix leaking {safe,check}_region
1 parent 6b2fe39 commit 163dffc

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed
 

Diff for: ‎worldedit_commands/init.lua

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ if minetest.place_schematic then
1111
end
1212

1313
dofile(minetest.get_modpath("worldedit_commands") .. "/mark.lua")
14-
dofile(minetest.get_modpath("worldedit_commands") .. "/safe.lua")
15-
safe_region = rawget(_G, "safe_region") or function(callback) return callback end
14+
local safe_region, check_region = dofile(minetest.get_modpath("worldedit_commands") .. "/safe.lua")
1615

1716
local function get_position(name) --position 1 retrieval function for when not using `safe_region`
1817
local pos1 = worldedit.pos1[name]

Diff for: ‎worldedit_commands/safe.lua

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
local safe_region_callback = {}
22
local safe_region_param = {}
33

4-
check_region = function(name, param)
4+
local function check_region(name, param)
55
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name] --obtain positions
66
if pos1 == nil or pos2 == nil then
77
worldedit.player_notify(name, "no region selected")
@@ -12,7 +12,7 @@ end
1212

1313
--`callback` is a callback to run when the user confirms
1414
--`nodes_needed` is a function accepting `param`, `pos1`, and `pos2` to calculate the number of nodes needed
15-
safe_region = function(callback, nodes_needed)
15+
local function safe_region(callback, nodes_needed)
1616
--default node volume calculation
1717
nodes_needed = nodes_needed or check_region
1818

@@ -63,3 +63,6 @@ minetest.register_chatcommand("/n", {
6363
safe_region_callback[name], safe_region_param[name] = nil, nil
6464
end,
6565
})
66+
67+
return safe_region, check_region
68+

0 commit comments

Comments
 (0)