mirror/WorldEdit
2
0
Fork 0
mirror of https://github.com/EngineHub/WorldEdit.git synced 2024-12-15 04:41:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed up the commitRequired checks.

Browse Source
This commit is contained in:
Matthew Miller 2018-12-09 15:15:34 +10:00
parent 5f2c77b719
commit 6f3016c7f0
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -386,7 +386,9 @@ public void setBlockChangeLimit(int limit) {
* Returns queue status. * Returns queue status.
* *
* @return whether the queue is enabled * @return whether the queue is enabled
* @deprecated Use {@link EditSession#getReorderMode()} with MULTI_STAGE instead.
*/ */
@Deprecated
public boolean isQueueEnabled() { public boolean isQueueEnabled() {
return reorderMode == ReorderMode.MULTI_STAGE && reorderExtent.isEnabled(); return reorderMode == ReorderMode.MULTI_STAGE && reorderExtent.isEnabled();
} }

4
worldedit-core/src/main/java/com/sk89q/worldedit/extent/reorder/ChunkBatchingExtent.java
View File

@ -73,7 +73,7 @@ public void setEnabled(boolean enabled) {
} }
public boolean commitRequired() { public boolean commitRequired() {
return enabled && batches.size() > 0; return enabled;
} }
@Override @Override
@ -88,7 +88,7 @@ public boolean setBlock(BlockVector3 location, BlockStateHolder block) throws Wo
@Override @Override
protected Operation commitBefore() { protected Operation commitBefore() {
if (!enabled) { if (!commitRequired()) {
return null; return null;
} }
return new Operation() { return new Operation() {

4
worldedit-core/src/main/java/com/sk89q/worldedit/extent/reorder/MultiStageReorder.java
View File

@ -199,7 +199,7 @@ public void setEnabled(boolean enabled) {
} }
public boolean commitRequired() { public boolean commitRequired() {
return enabled && stages.values().stream().anyMatch(stage -> stage.size() > 0); return enabled;
} }
/** /**
@ -248,7 +248,7 @@ public boolean setBlock(BlockVector3 location, BlockStateHolder block) throws Wo
@Override @Override
public Operation commitBefore() { public Operation commitBefore() {
if (!enabled) { if (!commitRequired()) {
return null; return null;
} }
List<Operation> operations = new ArrayList<>(); List<Operation> operations = new ArrayList<>();

4
worldedit-core/src/main/java/com/sk89q/worldedit/extent/world/FastModeExtent.java
View File

@ -114,12 +114,12 @@ public boolean setBlock(BlockVector3 location, BlockStateHolder block) throws Wo
} }
public boolean commitRequired() { public boolean commitRequired() {
return (enabled && !dirtyChunks.isEmpty()) || (postEditSimulation && !positions.isEmpty()); return enabled || postEditSimulation;
} }
@Override @Override
protected Operation commitBefore() { protected Operation commitBefore() {
if (!enabled && !postEditSimulation) { if (!commitRequired()) {
return null; return null;
} }
return new Operation() { return new Operation() {