From b202adb2ceab75a5b1dde2116092cef81b0547aa Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Sat, 24 Sep 2016 12:52:34 +1000 Subject: [PATCH] Fix progress tracking --- core/src/main/java/com/sk89q/worldedit/EditSession.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/sk89q/worldedit/EditSession.java b/core/src/main/java/com/sk89q/worldedit/EditSession.java index eb62e964..8a242643 100644 --- a/core/src/main/java/com/sk89q/worldedit/EditSession.java +++ b/core/src/main/java/com/sk89q/worldedit/EditSession.java @@ -46,6 +46,7 @@ import com.boydti.fawe.object.extent.FaweRegionExtent; import com.boydti.fawe.object.extent.NullExtent; import com.boydti.fawe.object.extent.ProcessedWEExtent; import com.boydti.fawe.object.mask.ResettableMask; +import com.boydti.fawe.object.progress.DefaultProgressTracker; import com.boydti.fawe.util.ExtentTraverser; import com.boydti.fawe.util.MaskTraverser; import com.boydti.fawe.util.MemUtil; @@ -274,7 +275,10 @@ public class EditSession extends AbstractWorld implements HasFaweQueue { queue = new MCAQueue(queue); } this.queue = queue; - queue.addEditSession(this); + this.queue.addEditSession(this); + if (Settings.QUEUE.PROGRESS.DISPLAY && player != null) { + this.queue.setProgressTask(new DefaultProgressTracker(player)); + } this.bypassAll = wrapExtent(new FastWorldEditExtent(world, queue), bus, event, Stage.BEFORE_CHANGE); this.bypassHistory = (this.extent = wrapExtent(bypassAll, bus, event, Stage.BEFORE_REORDER)); if (!fastmode && !(changeSet instanceof NullChangeSet)) { @@ -812,7 +816,7 @@ public class EditSession extends AbstractWorld implements HasFaweQueue { * @return height of highest block found or 'minY' */ public int getHighestTerrainBlock(final int x, final int z, int minY, int maxY, final boolean naturalOnly) { - maxY = Math.min(getMaximumPoint().getBlockY(), Math.max(0, maxY)); + maxY = Math.min(maxY, Math.max(0, maxY)); minY = Math.max(0, minY); for (int y = maxY; y >= minY; --y) { BaseBlock block = getLazyBlock(x, y, z);