Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-11-18 01:46:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Few fixes for FastModeExtent.

Browse Source
This commit is contained in:
Matthew Miller 2018-11-15 19:18:22 +10:00
parent 36430863a1
commit b3f5bc030e
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -246,6 +246,9 @@ public class EditSession implements Extent, AutoCloseable {
if (isBatchingChunks() && chunkBatchingExtent.commitRequired()) { if (isBatchingChunks() && chunkBatchingExtent.commitRequired()) {
return true; return true;
} }
if (hasFastMode() && fastModeExtent.commitRequired()) {
return true;
}
return false; return false;
} }

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

@ -31,10 +31,9 @@ import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.block.BlockStateHolder; import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockTypes; import com.sk89q.worldedit.world.block.BlockTypes;
import java.util.ArrayDeque;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Queue;
import java.util.Set; import java.util.Set;
/** /**
@ -43,7 +42,7 @@ import java.util.Set;
public class FastModeExtent extends AbstractDelegateExtent { public class FastModeExtent extends AbstractDelegateExtent {
private final World world; private final World world;
private final Queue<BlockVector3> positions = new ArrayDeque<>(); private final Set<BlockVector3> positions = new HashSet<>();
private final Set<BlockVector2> dirtyChunks = new HashSet<>(); private final Set<BlockVector2> dirtyChunks = new HashSet<>();
private boolean enabled = true; private boolean enabled = true;
private boolean postEditSimulation; private boolean postEditSimulation;
@ -106,7 +105,7 @@ public class FastModeExtent extends AbstractDelegateExtent {
if (world.setBlock(location, block, false)) { if (world.setBlock(location, block, false)) {
if (postEditSimulation) { if (postEditSimulation) {
positions.offer(location); positions.add(location);
} }
return true; return true;
} }
@ -117,6 +116,10 @@ public class FastModeExtent extends AbstractDelegateExtent {
} }
} }
public boolean commitRequired() {
return !dirtyChunks.isEmpty() || !positions.isEmpty();
}
@Override @Override
protected Operation commitBefore() { protected Operation commitBefore() {
return new Operation() { return new Operation() {
@ -127,9 +130,11 @@ public class FastModeExtent extends AbstractDelegateExtent {
} }
if (postEditSimulation) { if (postEditSimulation) {
while (run.shouldContinue() && !positions.isEmpty()) { Iterator<BlockVector3> positionIterator = positions.iterator();
BlockVector3 position = positions.poll(); // Remove from queue while (run.shouldContinue() && positionIterator.hasNext()) {
BlockVector3 position = positionIterator.next();
world.notifyAndLightBlock(position, BlockTypes.AIR.getDefaultState()); world.notifyAndLightBlock(position, BlockTypes.AIR.getDefaultState());
positionIterator.remove();
} }
return !positions.isEmpty() ? this : null; return !positions.isEmpty() ? this : null;