mtcontrib/Minetest-WorldEdit
1
0
Fork 1
mirror of https://github.com/Uberi/Minetest-WorldEdit.git synced 2025-07-10 20:10:26 +02:00
Code Issues Releases Wiki Activity

Remove ignore list and fix many warnings

Browse Source
This commit is contained in:
Panquesito7
2020-02-08 01:27:57 -06:00
parent 198cd4b4bc
commit 25aaab20de
10 changed files with 44 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
worldedit_commands/init.lua
View File

@ -82,7 +82,7 @@ end
-- end,
-- }
function worldedit.register_command(name, def)
local def = table.copy(def)
def = table.copy(def)
assert(name and #name > 0)
assert(def.privs)
def.require_pos = def.require_pos or 0
@ -1030,7 +1030,8 @@ worldedit.register_command("stretch", {
end,
func = function(name, stretchx, stretchy, stretchz)
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
local count, pos1, pos2 = worldedit.stretch(pos1, pos2, stretchx, stretchy, stretchz)
local count = worldedit.stretch(pos1, pos2, stretchx, stretchy, stretchz)
pos1, pos2 = worldedit.stretch(pos1, pos2, stretchx, stretchy, stretchz)
--reset markers to scaled positions
worldedit.pos1[name] = pos1
@ -1061,7 +1062,9 @@ worldedit.register_command("transpose", {
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
if axis1 == "?" then axis1 = worldedit.player_axis(name) end
if axis2 == "?" then axis2 = worldedit.player_axis(name) end
local count, pos1, pos2 = worldedit.transpose(pos1, pos2, axis1, axis2)
local count = worldedit.transpose(pos1, pos2, axis1, axis2)
pos1, pos2 = worldedit.transpose(pos1, pos2, axis1, axis2)
--reset markers to transposed positions
worldedit.pos1[name] = pos1
@ -1112,7 +1115,9 @@ worldedit.register_command("rotate", {
func = function(name, axis, angle)
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
if axis == "?" then axis = worldedit.player_axis(name) end
local count, pos1, pos2 = worldedit.rotate(pos1, pos2, axis, angle)
local count = worldedit.rotate(pos1, pos2, axis, angle)
pos1, pos2 = worldedit.rotate(pos1, pos2, axis, angle)
--reset markers to rotated positions
worldedit.pos1[name] = pos1
@ -1248,7 +1253,7 @@ worldedit.register_command("restore", {
})
local function detect_misaligned_schematic(name, pos1, pos2)
pos1, pos2 = worldedit.sort_pos(pos1, pos2)
pos1 = worldedit.sort_pos(pos1, pos2)
-- Check that allocate/save can position the schematic correctly
-- The expected behaviour is that the (0,0,0) corner of the schematic stays
-- sat pos1, this only works when the minimum position is actually present

6
worldedit_commands/mark.lua
View File

@ -4,7 +4,7 @@ worldedit.marker_region = {}
--marks worldedit region position 1
worldedit.mark_pos1 = function(name)
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
local pos1 = worldedit.pos1[name]
if pos1 ~= nil then
--make area stay loaded
@ -27,7 +27,7 @@ end
--marks worldedit region position 2
worldedit.mark_pos2 = function(name)
local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]
local pos2 = worldedit.pos2[name]
if pos2 ~= nil then
--make area stay loaded
@ -60,7 +60,7 @@ worldedit.mark_region = function(name)
end
if pos1 ~= nil and pos2 ~= nil then
local pos1, pos2 = worldedit.sort_pos(pos1, pos2)
pos1, pos2 = worldedit.sort_pos(pos1, pos2)
local vec = vector.subtract(pos2, pos1)
local maxside = math.max(vec.x, math.max(vec.y, vec.z))