diff --git a/worldeditadditions_commands/commands/maze.lua b/worldeditadditions_commands/commands/maze.lua index 0d84466..88c5b7b 100644 --- a/worldeditadditions_commands/commands/maze.lua +++ b/worldeditadditions_commands/commands/maze.lua @@ -1,5 +1,6 @@ local wea = worldeditadditions local we_c = worldeditadditions_commands +local Vector3 = worldeditadditions.Vector3 local function parse_params_maze(params_text, is_3d) if not params_text then params_text = "" end @@ -74,12 +75,20 @@ worldedit.register_command("maze", { return worldedit.volume(worldedit.pos1[name], worldedit.pos2[name]) end, func = function(name, replace_node, seed, path_length, path_width) - local start_time = worldeditadditions.get_ms_time() - local replaced = worldeditadditions.maze2d(worldedit.pos1[name], worldedit.pos2[name], replace_node, seed, path_length, path_width) - local time_taken = worldeditadditions.get_ms_time() - start_time + local start_time = wea.get_ms_time() - minetest.log("action", name .. " used //maze at " .. worldeditadditions.vector.tostring(worldedit.pos1[name]) .. " - "..worldeditadditions.vector.tostring(worldedit.pos2[name])..", replacing " .. replaced .. " nodes in " .. time_taken .. "s") - return true, replaced .. " nodes replaced in " .. worldeditadditions.format.human_time(time_taken) + local pos1, pos2 = Vector3.sort(worldedit.pos1[name], worldedit.pos2[name]) + local replaced = wea.maze2d( + pos1, pos2, + replace_node, + seed, + path_length, path_width + ) + + local time_taken = wea.get_ms_time() - start_time + + minetest.log("action", name.." used //maze at "..pos1.." - "..pos2..", replacing "..replaced.." nodes in "..time_taken.."s") + return true, replaced.." nodes replaced in "..wea.format.human_time(time_taken) end }) @@ -109,7 +118,7 @@ worldedit.register_command("maze3d", { local time_taken = worldeditadditions.get_ms_time() - start_time - minetest.log("action", name .. " used //maze3d at " .. worldeditadditions.vector.tostring(worldedit.pos1[name]) .. " - "..worldeditadditions.vector.tostring(worldedit.pos2[name])..", replacing " .. replaced .. " nodes in " .. time_taken .. "s") - return true, replaced .. " nodes replaced in " .. worldeditadditions.format.human_time(time_taken) + minetest.log("action", name.." used //maze3d at "..worldeditadditions.vector.tostring(worldedit.pos1[name]).." - "..worldeditadditions.vector.tostring(worldedit.pos2[name])..", replacing "..replaced.." nodes in "..time_taken.."s") + return true, replaced.." nodes replaced in "..worldeditadditions.format.human_time(time_taken) end })