Skip to content

Commit 4660927

Browse files
committedApr 20, 2014
Fix safe region functionality (thanks ChaosWormz).
1 parent 2784a25 commit 4660927

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed
 

‎worldedit_commands/safe.lua

+10-13
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
local safe_region_callback
2-
local safe_region_name
3-
local safe_region_param
1+
local safe_region_callback = {}
2+
local safe_region_param = {}
43

54
check_region = function(name, param)
6-
--obtain positions
7-
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
5+
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name] --obtain positions
86
if pos1 == nil or pos2 == nil then
97
worldedit.player_notify(name, "no region selected")
108
return nil
119
end
12-
1310
return worldedit.volume(pos1, pos2)
1411
end
1512

@@ -28,16 +25,16 @@ safe_region = function(callback, nodes_needed)
2825
end
2926

3027
--save callback to call later
31-
safe_region_callback, safe_region_name, safe_region_param = callback, name, param
28+
safe_region_callback[name], safe_region_param[name] = callback, param
3229
worldedit.player_notify(name, "WARNING: this operation could affect up to " .. count .. " nodes; type //y to continue or //n to cancel")
3330
end
3431
end
3532

3633
minetest.register_chatcommand("/y", {
3734
params = "",
3835
description = "Confirm a pending operation",
39-
func = function()
40-
local callback, name, param = safe_region_callback, safe_region_name, safe_region_param
36+
func = function(name)
37+
local callback, param = safe_region_callback[name], safe_region_param[name]
4138
if not callback then
4239
worldedit.player_notify(name, "no operation pending")
4340
return
@@ -50,19 +47,19 @@ minetest.register_chatcommand("/y", {
5047
return
5148
end
5249

53-
safe_region_callback, safe_region_name, safe_region_param = nil, nil, nil --reset pending operation
50+
safe_region_callback[name], safe_region_param[name] = nil, nil --reset pending operation
5451
callback(name, param, pos1, pos2)
5552
end,
5653
})
5754

5855
minetest.register_chatcommand("/n", {
5956
params = "",
6057
description = "Confirm a pending operation",
61-
func = function()
62-
if not safe_region_callback then
58+
func = function(name)
59+
if not safe_region_callback[name] then
6360
worldedit.player_notify(name, "no operation pending")
6461
return
6562
end
66-
safe_region_callback, safe_region_name, safe_region_param = nil, nil, nil
63+
safe_region_callback[name], safe_region_param[name] = nil, nil
6764
end,
6865
})

0 commit comments

Comments
 (0)
Please sign in to comment.