Permalink
Browse files

Simplify commit-required detection

  • Loading branch information...
kenzierocks committed Nov 4, 2018
1 parent 351a8bb commit e202348dac02449f14db7daac5a89f5be2b49aa6
@@ -104,7 +104,6 @@
import com.sk89q.worldedit.world.NullWorld;
import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.biome.BaseBiome;
import com.sk89q.worldedit.world.block.BaseBlock;
import com.sk89q.worldedit.world.block.BlockCategories;
import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockStateHolder;
@@ -113,8 +112,6 @@
import com.sk89q.worldedit.world.registry.LegacyMapper;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
@@ -234,14 +231,15 @@ private Extent wrapExtent(Extent extent, EventBus eventBus, EditSessionEvent eve
return event.getExtent();
}
// pkg private for TracedEditSession only
ChunkBatchingExtent getChunkBatchingExtent() {
return chunkBatchingExtent;
}
MultiStageReorder getReorderExtent() {
return reorderExtent;
// pkg private for TracedEditSession only, may later become public API
boolean commitRequired() {
if (isQueueEnabled() && reorderExtent.commitRequired()) {
return true;
}
if (isBatchingChunks() && chunkBatchingExtent.commitRequired()) {
return true;
}
return false;
}
/**
@@ -37,11 +37,8 @@
@Override
protected void finalize() throws Throwable {
super.finalize();
if (!isQueueEnabled() && !isBatchingChunks()) {
return;
}
if (getChunkBatchingExtent().commitRequired() || getReorderExtent().commitRequired()) {
if (commitRequired()) {
WorldEdit.logger.warning("####### LEFTOVER BUFFER BLOCKS DETECTED #######");
WorldEdit.logger.warning("This means that some code did not flush their EditSession.");
WorldEdit.logger.log(Level.WARNING, "Here is a stacktrace from the creation of this EditSession:", stacktrace);

0 comments on commit e202348

Please sign in to comment.