Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-05 16:40:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify commit-required detection

Browse Source
This commit is contained in:
Kenzie Togami 2018-11-03 22:22:43 -07:00
parent 351a8bbc6c
commit e202348dac
No known key found for this signature in database
GPG Key ID: 5D200B325E157A81
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
View File

@ -104,7 +104,6 @@ import com.sk89q.worldedit.util.eventbus.EventBus;
import com.sk89q.worldedit.world.NullWorld; import com.sk89q.worldedit.world.NullWorld;
import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.biome.BaseBiome; 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.BlockCategories;
import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.block.BlockState;
import com.sk89q.worldedit.world.block.BlockStateHolder; import com.sk89q.worldedit.world.block.BlockStateHolder;
@ -113,8 +112,6 @@ import com.sk89q.worldedit.world.block.BlockTypes;
import com.sk89q.worldedit.world.registry.LegacyMapper; import com.sk89q.worldedit.world.registry.LegacyMapper;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@ -234,14 +231,15 @@ public class EditSession implements Extent, AutoCloseable {
return event.getExtent(); return event.getExtent();
} }
// pkg private for TracedEditSession only // pkg private for TracedEditSession only, may later become public API
boolean commitRequired() {
ChunkBatchingExtent getChunkBatchingExtent() { if (isQueueEnabled() && reorderExtent.commitRequired()) {
return chunkBatchingExtent; return true;
} }
if (isBatchingChunks() && chunkBatchingExtent.commitRequired()) {
MultiStageReorder getReorderExtent() { return true;
return reorderExtent; }
return false;
} }
/** /**

5
worldedit-core/src/main/java/com/sk89q/worldedit/TracedEditSession.java
View File

@ -37,11 +37,8 @@ public class TracedEditSession extends EditSession {
@Override @Override
protected void finalize() throws Throwable { protected void finalize() throws Throwable {
super.finalize(); super.finalize();
if (!isQueueEnabled() && !isBatchingChunks()) {
return;
}
if (getChunkBatchingExtent().commitRequired() || getReorderExtent().commitRequired()) { if (commitRequired()) {
WorldEdit.logger.warning("####### LEFTOVER BUFFER BLOCKS DETECTED #######"); WorldEdit.logger.warning("####### LEFTOVER BUFFER BLOCKS DETECTED #######");
WorldEdit.logger.warning("This means that some code did not flush their EditSession."); 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); WorldEdit.logger.log(Level.WARNING, "Here is a stacktrace from the creation of this EditSession:", stacktrace);