Permalink
Browse files

Fix some minor ordering bugs

  • Loading branch information...
kenzierocks committed Oct 10, 2018
1 parent 7d4906c commit 2824a92c19811c76d51aa0968c88cd5f50e62290
@@ -192,7 +192,6 @@
extent = fastModeExtent = new FastModeExtent(world, false);
extent = survivalExtent = new SurvivalModeExtent(extent, world);
extent = quirkExtent = new BlockQuirkExtent(extent, world);
extent = chunkBatchingExtent = new ChunkBatchingExtent(extent);
extent = chunkLoadingExtent = new ChunkLoadingExtent(extent, world);
extent = cacheExtent = new LastAccessExtentCache(extent);
extent = wrapExtent(extent, eventBus, event, Stage.BEFORE_CHANGE);
@@ -201,6 +200,7 @@
// This extent can be skipped by calling rawSetBlock()
extent = reorderExtent = new MultiStageReorder(extent, false);
extent = chunkBatchingExtent = new ChunkBatchingExtent(extent);
extent = wrapExtent(extent, eventBus, event, Stage.BEFORE_REORDER);
// These extents can be skipped by calling smartSetBlock()
@@ -90,10 +90,14 @@ protected Operation commitBefore() {
}
return new Operation() {
private final Iterator<LocatedBlockList> batchIterator = batches.values().iterator();
// we get modified between create/resume -- only create this on resume to prevent CME
private Iterator<LocatedBlockList> batchIterator;
@Override
public Operation resume(RunContext run) throws WorldEditException {
if (batchIterator == null) {
batchIterator = batches.values().iterator();
}
if (!batchIterator.hasNext()) {
return null;
}

0 comments on commit 2824a92

Please sign in to comment.