Fix transpose and rotate

diff --git a/functions.lua b/functions.lua
index 425a6ac2dfa6a69741cdc023ad348707e95ccab3..ea10760aecd17bbd0967f2cae43db3fd9bf4331c 100644 (file)
--- a/functions.lua
+++ b/functions.lua
@@ -340,13 +340,13 @@ worldedit.transpose = function(pos1, pos2, axis1, axis2)
                                        local node1 = env:get_node(pos)\r
                                        local meta1a = env:get_meta(pos):to_table()\r
                                        local value1, value2 = pos[axis1], pos[axis2]\r
-                                       pos[axis1], pos[axis2] = pos1[axis1] + extent1, pos1[axis2] + extent2\r
+                                       pos[axis1], pos[axis2] = pos1[axis1] + extent2, pos1[axis2] + extent1\r
                                        local node2 = env:get_node(pos)\r
                                        local meta2a = env:get_meta(pos):to_table()\r
                                        env:add_node(pos, node1)\r
                                        local meta1b = env:get_meta(pos)\r
                                        meta1b:from_table(meta1a)\r
-                                       pos[axis1], pos[axis2] = value1, value2\r
+                                       pos[axis1], pos[axis2] = pos1[axis1] + extent1, pos1[axis2] + extent2\r
                                        env:add_node(pos, node2)\r
                                        local meta2b = env:get_meta(pos)\r
                                        meta2b:from_table(meta2a)\r
@@ -408,16 +408,12 @@ worldedit.rotate = function(pos1, pos2, angle)
 \r
        if angle == 90 then\r
                worldedit.transpose(pos1, pos2, "x", "z")\r
-               pos1.x, pos1.z = pos1.z, pos1.x\r
-               pos2.x, pos2.z = pos2.z, pos2.x\r
                worldedit.flip(pos1, pos2, "z")\r
        elseif angle == 180 then\r
                worldedit.flip(pos1, pos2, "x")\r
                worldedit.flip(pos1, pos2, "z")\r
        elseif angle == 270 then\r
                worldedit.transpose(pos1, pos2, "x", "z")\r
-               pos1.x, pos1.z = pos1.z, pos1.x\r
-               pos2.x, pos2.z = pos2.z, pos2.x\r
                worldedit.flip(pos1, pos2, "x")\r
        else\r
                return 0\r