Mirrorlandia_minetest/Minetest-WorldEdit
1
0
Fork 0
mirror of https://github.com/Uberi/Minetest-WorldEdit.git synced 2024-12-04 21:33:43 +01:00
Code Issues Projects Releases Wiki Activity

Fix /shift command to conform to worldedit command standard

Browse Source
This commit is contained in:
Daniel Sosa 2015-02-16 02:28:50 +00:00
parent 40cee99700
commit f1fe0c6bba
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
worldedit_commands/cuboid.lua
View File

@ -82,19 +82,23 @@ minetest.register_chatcommand("/inset", {
minetest.register_chatcommand("/shift", {
params = "<amount> [up|down|left|right|front|back]",
-- params = "<amount> [up|down|left|right|front|back]",
params = "[x|y|z|?|up|down|left|right|front|back] [+|-]<amount>",
description = "Moves the selection region. Does not move contents.",
privs = {worldedit=true},
func = function(name, param)
local pos1 = worldedit.pos1[name]
local pos2 = worldedit.pos2[name]
local find, _, amount, direction = param:find("(%d+)%s*(%l*)")
-- local find, _, amount, direction = param:find("(%d+)%s*(%l*)")
local find, _, direction, amount = param:find("([%?%l]+)%s*([+-]?%d+)")
if find == nil then
worldedit.player_notify(name, "invalid usage: " .. param)
return
end
worldedit.player_notify(name, "direction = " .. direction .. " amount = " .. amount)
if pos1 == nil or pos2 == nil then
worldedit.player_notify(name,
"Undefined region. Region must be defined beforehand.")
@ -102,14 +106,14 @@ minetest.register_chatcommand("/shift", {
end
local axis, dir
if direction ~= "" then
if direction ~= "?" then
axis, dir = worldedit.translate_direction(name, direction)
else
axis, dir = worldedit.player_axis(name)
end
if axis == nil or dir == nil then
return false, "Invalid if looking up or down"
return false, "Invalid"
end
assert(worldedit.cuboid_shift(name, axis, amount * dir))

2
worldedit_commands/cuboidapi.lua
View File

@ -205,7 +205,7 @@ end
worldedit.translate_direction = function(name, direction)
local axis, dir = worldedit.player_axis(name)
local resaxis, resdir
if direction == "up" then
return 'y', 1
end