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

Added "fast mode corrections"

Browse Source
This commit is contained in:
Matthew Miller
2018-10-15 20:50:09 +10:00
committed by IronApollo
parent 346eee8953
commit e88b8c961d
10 changed files with 101 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,9 +29,12 @@ import com.sk89q.worldedit.function.operation.Operation;
import com.sk89q.worldedit.function.operation.RunContext;
import com.sk89q.worldedit.world.World;
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockTypes;
import java.util.ArrayDeque;
import java.util.HashSet;
import java.util.List;
import java.util.Queue;
import java.util.Set;
/**
@ -40,8 +43,10 @@ import java.util.Set;
public class FastModeExtent extends AbstractDelegateExtent {
private final World world;
private final Queue<BlockVector3> positions = new ArrayDeque<>();
private final Set<BlockVector2> dirtyChunks = new HashSet<>();
private boolean enabled = true;
private boolean postEditSimulation;
/**
* Create a new instance with fast mode enabled.
@ -63,6 +68,9 @@ public class FastModeExtent extends AbstractDelegateExtent {
checkNotNull(world);
this.world = world;
this.enabled = enabled;
if (enabled) {
this.postEditSimulation = true;
}
}
/**
@ -83,11 +91,27 @@ public class FastModeExtent extends AbstractDelegateExtent {
this.enabled = enabled;
}
public boolean isPostEditSimulationEnabled() {
return postEditSimulation;
}
public void setPostEditSimulationEnabled(boolean enabled) {
this.postEditSimulation = enabled;
}
@Override
public boolean setBlock(BlockVector3 location, BlockStateHolder block) throws WorldEditException {
if (enabled) {
dirtyChunks.add(BlockVector2.at(location.getBlockX() >> 4, location.getBlockZ() >> 4));
return world.setBlock(location, block, false);
if (world.setBlock(location, block, false)) {
if (postEditSimulation) {
positions.offer(location);
}
return true;
}
return false;
} else {
return world.setBlock(location, block, true);
}
@ -101,6 +125,16 @@ public class FastModeExtent extends AbstractDelegateExtent {
if (!dirtyChunks.isEmpty()) {
world.fixAfterFastMode(dirtyChunks);
}
if (postEditSimulation) {
while (run.shouldContinue() && !positions.isEmpty()) {
BlockVector3 position = positions.poll(); // Remove from queue
world.notifyAndLightBlock(position, BlockTypes.AIR.getDefaultState());
}
return !positions.isEmpty() ? this : null;
}
return null;
}