Use minetest.get_objects_in_area when possible

[worldedit.git] / worldedit_commands / safe.lua

diff --git a/worldedit_commands/safe.lua b/worldedit_commands/safe.lua
index 834462c8bfc7b8734b8ae3435ca08095793692c7..c83cac8a8f7f2ba788dd396ce1e2b95efcf240f2 100644 (file)
--- a/worldedit_commands/safe.lua
+++ b/worldedit_commands/safe.lua
@@ -1,68 +1,48 @@
-local safe_region_callback\r
-local safe_region_name\r
-local safe_region_param\r
+local safe_region_callback = {}\r
 \r
-check_region = function(name, param)\r
-       --obtain positions\r
-       local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]\r
-       if pos1 == nil or pos2 == nil then\r
-               worldedit.player_notify(name, "no region selected")\r
-               return nil\r
+--`count` is the number of nodes that would possibly be modified\r
+--`callback` is a callback to run when the user confirms\r
+local function safe_region(name, count, callback)\r
+       if count < 20000 then\r
+               return callback()\r
        end\r
 \r
-       return worldedit.volume(pos1, pos2)\r
+       --save callback to call later\r
+       safe_region_callback[name] = callback\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
 \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
-       --default node volume calculation\r
-       nodes_needed = nodes_needed or check_region\r
-\r
-       return function(name, param)\r
-               --check if the operation applies to a safe number of nodes\r
-               local count = nodes_needed(name, param)\r
-               if count == nil then return end --invalid command\r
-               if count < 10000 then\r
-                       return callback(name, param)\r
-               end\r
-\r
-               --save callback to call later\r
-               safe_region_callback, safe_region_name, safe_region_param = callback, name, 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
+local function reset_pending(name)\r
+       safe_region_callback[name] = nil\r
 end\r
 \r
 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 = safe_region_callback[name]\r
                if not callback then\r
                        worldedit.player_notify(name, "no operation pending")\r
                        return\r
                end\r
 \r
-               --obtain positions\r
-               local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]\r
-               if pos1 == nil or pos2 == nil then\r
-                       worldedit.player_notify(name, "no region selected")\r
-                       return\r
-               end\r
-\r
-               safe_region_callback, safe_region_name, safe_region_param = nil, nil, nil --reset pending operation\r
-               callback(name, param, pos1, pos2)\r
+               reset_pending(name)\r
+               callback(name)\r
        end,\r
 })\r
 \r
 minetest.register_chatcommand("/n", {\r
        params = "",\r
-       description = "Confirm a pending operation",\r
-       func = function()\r
-               if not safe_region_callback then \r
+       description = "Abort a pending operation",\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
+\r
+               reset_pending(name)\r
        end,\r
 })\r
+\r
+\r
+return safe_region, reset_pending\r