Upstream/FastAsyncWorldedit
1
0
Fork 0
mirror of https://github.com/boy0001/FastAsyncWorldedit.git synced 2024-11-28 21:56:33 +01:00
Code Issues Projects Releases Wiki Activity

Fix move

Browse Source 
Fixes #631
Fixes #524
This commit is contained in:
Jesse Boyd 2017-08-22 15:14:32 +10:00
parent 3f0fe44f72
commit c7c4da6237
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,6 +58,7 @@ import com.boydti.fawe.object.extent.SlowExtent;
import com.boydti.fawe.object.extent.SourceMaskExtent; import com.boydti.fawe.object.extent.SourceMaskExtent;
import com.boydti.fawe.object.function.SurfaceRegionFunction; import com.boydti.fawe.object.function.SurfaceRegionFunction;
import com.boydti.fawe.object.mask.ResettableMask; import com.boydti.fawe.object.mask.ResettableMask;
import com.boydti.fawe.object.pattern.ExistingPattern;
import com.boydti.fawe.object.progress.ChatProgressTracker; import com.boydti.fawe.object.progress.ChatProgressTracker;
import com.boydti.fawe.object.progress.DefaultProgressTracker; import com.boydti.fawe.object.progress.DefaultProgressTracker;
import com.boydti.fawe.object.visitor.FastChunkIterator; import com.boydti.fawe.object.visitor.FastChunkIterator;
@ -2011,7 +2012,11 @@ public class EditSession extends AbstractWorld implements HasFaweQueue, Lighting
return moveRegion(region, dir, distance, copyAir, true, false, replacement); return moveRegion(region, dir, distance, copyAir, true, false, replacement);
} }
public int moveRegion(final Region region, final Vector dir, final int distance, final boolean copyAir, final boolean copyEntities, final boolean copyBiomes, final BaseBlock replacement) { public int moveRegion(final Region region, final Vector dir, final int distance, final boolean copyAir, final boolean copyEntities, final boolean copyBiomes, BaseBlock replacement) {
return moveRegion(region, dir, distance, copyAir, copyEntities, copyBiomes, (Pattern) replacement);
}
public int moveRegion(final Region region, final Vector dir, final int distance, final boolean copyAir, final boolean copyEntities, final boolean copyBiomes, Pattern replacement) {
checkNotNull(region); checkNotNull(region);
checkNotNull(dir); checkNotNull(dir);
checkArgument(distance >= 1, "distance >= 1 required"); checkArgument(distance >= 1, "distance >= 1 required");
@ -2019,10 +2024,19 @@ public class EditSession extends AbstractWorld implements HasFaweQueue, Lighting
final Vector size = region.getMaximumPoint().subtract(region.getMinimumPoint()).add(1, 1, 1); final Vector size = region.getMaximumPoint().subtract(region.getMinimumPoint()).add(1, 1, 1);
final Vector to = region.getMinimumPoint(); final Vector to = region.getMinimumPoint();
Vector disAbs = displace.positive();
if (disAbs.getBlockX() < size.getBlockX() && disAbs.getBlockY() < size.getBlockY() && disAbs.getBlockZ() < size.getBlockZ()) {
// Buffer if overlapping
queue.dequeue();
}
final ForwardExtentCopy copy = new ForwardExtentCopy(EditSession.this, region, EditSession.this, to); final ForwardExtentCopy copy = new ForwardExtentCopy(EditSession.this, region, EditSession.this, to);
final com.sk89q.worldedit.function.pattern.Pattern pattern = replacement != null ? replacement : (new BaseBlock(BlockID.AIR)); if (replacement == null) replacement = nullBlock;
final BlockReplace remove = new BlockReplace(EditSession.this, pattern) { final BlockReplace remove = replacement instanceof ExistingPattern ? null : new BlockReplace(EditSession.this, replacement) {
private MutableBlockVector mutable = new MutableBlockVector(); private MutableBlockVector mutable = new MutableBlockVector();
@Override @Override

2
core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java
View File

@ -537,7 +537,7 @@ public class RegionCommands extends MethodCommands {
@Selection Region region, @Selection Region region,
@Optional("1") @Range(min = 1) int count, @Optional("1") @Range(min = 1) int count,
@Optional(Direction.AIM) @Direction Vector direction, @Optional(Direction.AIM) @Direction Vector direction,
@Optional("air") BaseBlock replace, @Optional("air") Pattern replace,
@Switch('b') boolean copyBiomes, @Switch('b') boolean copyBiomes,
@Switch('e') boolean skipEntities, @Switch('e') boolean skipEntities,
@Switch('a') boolean skipAir, @Switch('a') boolean skipAir,