diff options
| author | Vanessa Ezekowitz <vanessaezekowitz@gmail.com> | 2018-02-13 14:05:34 -0500 |
|---|---|---|
| committer | Vanessa Ezekowitz <vanessaezekowitz@gmail.com> | 2018-02-13 14:05:34 -0500 |
| commit | 335d9a3eddcb590c3ca5de9cba9b152e5e560af1 (patch) | |
| tree | 1b95d73b945fbc9924438c28a35d7f1019fa255f /worldedit | |
| parent | 1d0f113f4c5afcf8479973f2e01786fb9a1fbbb7 (diff) | |
| download | dreambuilder_modpack-335d9a3eddcb590c3ca5de9cba9b152e5e560af1.tar dreambuilder_modpack-335d9a3eddcb590c3ca5de9cba9b152e5e560af1.tar.gz dreambuilder_modpack-335d9a3eddcb590c3ca5de9cba9b152e5e560af1.tar.bz2 dreambuilder_modpack-335d9a3eddcb590c3ca5de9cba9b152e5e560af1.tar.xz dreambuilder_modpack-335d9a3eddcb590c3ca5de9cba9b152e5e560af1.zip | |
removed boost_cart and carbone_mobs -- too many crashes
updated blox, homedecor, plantlifed, cottages, farming_redo,
framedglass, gloopblocks, mesecons, moreblocks, moretrees,
pipeworks, player_textures, replacer, signs_lib, stained_glass,
technic, travelnet, unified_inventory, unifieddyes, and worldedit.
Diffstat (limited to 'worldedit')
| -rw-r--r-- | worldedit/manipulations.lua | 2 | ||||
| -rw-r--r-- | worldedit/primitives.lua | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/worldedit/manipulations.lua b/worldedit/manipulations.lua index 995619c..ee51561 100644 --- a/worldedit/manipulations.lua +++ b/worldedit/manipulations.lua @@ -301,7 +301,7 @@ function worldedit.stack(pos1, pos2, axis, count) local amount = 0
local copy = worldedit.copy
local i = 1
- function next_one()
+ local function next_one()
if i <= count then
i = i + 1
amount = amount + length
diff --git a/worldedit/primitives.lua b/worldedit/primitives.lua index 1bebfde..0a7d175 100644 --- a/worldedit/primitives.lua +++ b/worldedit/primitives.lua @@ -208,12 +208,13 @@ function worldedit.pyramid(pos, axis, height, node_name, hollow) local other1, other2 = worldedit.get_axis_others(axis)
-- Set up voxel manipulator
- local manip, area = mh.init_axis_radius(pos, axis,
- height >= 0 and height or -height)
+ -- FIXME: passing negative <radius> causes mis-sorted pos to be passed
+ -- into mh.init() which is technically not allowed but works
+ local manip, area = mh.init_axis_radius(pos, axis, height)
local data = mh.get_empty_data(area)
-- Handle inverted pyramids
- local start_axis, end_axis, step
+ local step
if height > 0 then
height = height - 1
step = 1
|