]> git.lizzy.rs Git - worldedit.git/commitdiff
Fix safe region functionality (thanks ChaosWormz).
authorUberi <azhang9@gmail.com>
Sun, 20 Apr 2014 03:33:20 +0000 (23:33 -0400)
committerUberi <azhang9@gmail.com>
Sun, 20 Apr 2014 03:33:20 +0000 (23:33 -0400)
worldedit_commands/safe.lua

index 834462c8bfc7b8734b8ae3435ca08095793692c7..c6751c13eb96e4ddb4356ab6d6bb218d21e5e3ad 100644 (file)
@@ -1,15 +1,12 @@
-local safe_region_callback\r
-local safe_region_name\r
-local safe_region_param\r
+local safe_region_callback = {}\r
+local safe_region_param = {}\r
 \r
 check_region = function(name, param)\r
-       --obtain positions\r
-       local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]\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
                return nil\r
        end\r
-\r
        return worldedit.volume(pos1, pos2)\r
 end\r
 \r
@@ -28,7 +25,7 @@ safe_region = function(callback, nodes_needed)
                end\r
 \r
                --save callback to call later\r
-               safe_region_callback, safe_region_name, safe_region_param = callback, name, param\r
+               safe_region_callback[name], safe_region_param[name] = callback, param\r
                worldedit.player_notify(name, "WARNING: this operation could affect up to " .. count .. " nodes; type //y to continue or //n to cancel")\r
        end\r
 end\r
@@ -36,8 +33,8 @@ end
 minetest.register_chatcommand("/y", {\r
        params = "",\r
        description = "Confirm a pending operation",\r
-       func = function()\r
-               local callback, name, param = safe_region_callback, safe_region_name, safe_region_param\r
+       func = function(name)\r
+               local callback, param = safe_region_callback[name], safe_region_param[name]\r
                if not callback then\r
                        worldedit.player_notify(name, "no operation pending")\r
                        return\r
@@ -50,7 +47,7 @@ minetest.register_chatcommand("/y", {
                        return\r
                end\r
 \r
-               safe_region_callback, safe_region_name, safe_region_param = nil, nil, nil --reset pending operation\r
+               safe_region_callback[name], safe_region_param[name] = nil, nil --reset pending operation\r
                callback(name, param, pos1, pos2)\r
        end,\r
 })\r
@@ -58,11 +55,11 @@ minetest.register_chatcommand("/y", {
 minetest.register_chatcommand("/n", {\r
        params = "",\r
        description = "Confirm a pending operation",\r
-       func = function()\r
-               if not safe_region_callback then \r
+       func = function(name)\r
+               if not safe_region_callback[name] then\r
                        worldedit.player_notify(name, "no operation pending")\r
                        return\r
                end\r
-               safe_region_callback, safe_region_name, safe_region_param = nil, nil, nil\r
+               safe_region_callback[name], safe_region_param[name] = nil, nil\r
        end,\r
 })\r