Rewrite command registration

[worldedit.git] / worldedit_commands / safe.lua

diff --git a/worldedit_commands/safe.lua b/worldedit_commands/safe.lua
index 0bd30d76ec2e1904b34658886ba4bd46ca1c723f..53689e2d60c9e5ba51abb86a25dc1d3e38da075e 100644 (file)
--- a/worldedit_commands/safe.lua
+++ b/worldedit_commands/safe.lua
@@ -1,53 +1,35 @@
 local safe_region_callback = {}\r
-local safe_region_param = {}\r
 \r
 worldedit._override_safe_regions = false -- internal use ONLY!\r
 \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
-               return nil\r
-       end\r
-       return worldedit.volume(pos1, pos2)\r
-end\r
-\r
+--`count` is the number of nodes that would possibly be modified\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
-local function safe_region(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 worldedit._override_safe_regions or count < 10000 then\r
-                       return callback(name, param)\r
-               end\r
-\r
-               --save callback to call later\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
+local function safe_region(name, count, callback)\r
+       if worldedit._override_safe_regions or count < 10000 then\r
+               return callback()\r
        end\r
+\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
 local function reset_pending(name)\r
-       safe_region_callback[name], safe_region_param[name] = nil, nil\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(name)\r
-               local callback, param = safe_region_callback[name], safe_region_param[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
                reset_pending(name)\r
-               callback(name, param)\r
+               callback(name)\r
        end,\r
 })\r
 \r
@@ -65,4 +47,4 @@ minetest.register_chatcommand("/n", {
 })\r
 \r
 \r
-return safe_region, check_region, reset_pending\r
+return safe_region, reset_pending\r