From 319b3c5f7feb04d250e57b74e01e621ca1e68336 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Mon, 18 Nov 2019 14:49:52 +0000 Subject: [PATCH] fix chunks not being submitted --- .../beta/implementation/queue/SingleThreadQueueExtent.java | 4 +++- .../main/java/com/boydti/fawe/object/brush/InspectBrush.java | 1 - .../java/com/boydti/fawe/object/changeset/FaweChangeSet.java | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/queue/SingleThreadQueueExtent.java b/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/queue/SingleThreadQueueExtent.java index c43e49a06..e7cbd42bf 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/queue/SingleThreadQueueExtent.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/queue/SingleThreadQueueExtent.java @@ -138,7 +138,9 @@ public class SingleThreadQueueExtent extends ExtentBatchProcessorHolder implemen } final long index = MathMan.pairInt(chunk.getX(), chunk.getZ()); chunks.remove(index, chunk); - return submitUnchecked(chunk); + V future = submitUnchecked(chunk); + submissions.add(future); + return future; } /** diff --git a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/InspectBrush.java b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/InspectBrush.java index ea5323294..d19cdc75c 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/InspectBrush.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/InspectBrush.java @@ -70,7 +70,6 @@ public class InspectBrush extends BrushTool implements DoubleActionTraceTool { final int y = target.getBlockY(); final int z = target.getBlockZ(); World world = player.getWorld(); - EditSessionBuilder editSession = new EditSessionBuilder(world).player(player); RollbackDatabase db = DBHandler.IMP.getDatabase(world); final AtomicInteger count = new AtomicInteger(); db.getPotentialEdits(null, 0, target, target, new RunnableVal() { diff --git a/worldedit-core/src/main/java/com/boydti/fawe/object/changeset/FaweChangeSet.java b/worldedit-core/src/main/java/com/boydti/fawe/object/changeset/FaweChangeSet.java index ffc6afbf4..de0624ffd 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/object/changeset/FaweChangeSet.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/object/changeset/FaweChangeSet.java @@ -145,7 +145,6 @@ public abstract class FaweChangeSet implements ChangeSet, IBatchProcessor, Close @Override public synchronized IChunkSet processSet(IChunk chunk, IChunkGet get, IChunkSet set) { - System.out.println("Add chunk " + chunk.getX() + "," + chunk.getZ() + " | " + set.getBitMask()); int bx = chunk.getX() << 4; int bz = chunk.getZ() << 4; @@ -224,7 +223,6 @@ public abstract class FaweChangeSet implements ChangeSet, IBatchProcessor, Close } } } - return set; }