Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply source function after source mask in ForwardExtentCopy.

Browse Source 
The source function should only get applied to actually copied blocks.
This commit is contained in:
wizjany 2019-03-01 21:15:21 -05:00
parent f46c70093c
commit e53962dadd
3 changed files with 9 additions and 7 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

@ -1252,7 +1252,7 @@ public class EditSession implements Extent, AutoCloseable {
BlockVector3 to = region.getMinimumPoint(); BlockVector3 to = region.getMinimumPoint();
// Remove the original blocks // Remove the original blocks
com.sk89q.worldedit.function.pattern.Pattern pattern = replacement != null ? Pattern pattern = replacement != null ?
replacement : replacement :
new BlockPattern(BlockTypes.AIR.getDefaultState()); new BlockPattern(BlockTypes.AIR.getDefaultState());
BlockReplace remove = new BlockReplace(this, pattern); BlockReplace remove = new BlockReplace(this, pattern);

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

@ -262,11 +262,12 @@ public class RegionCommands {
@Command( @Command(
aliases = { "/move" }, aliases = { "/move" },
usage = "[count] [direction] [leave-id]", usage = "[count] [direction] [leave-id]",
flags = "s", flags = "sa",
desc = "Move the contents of the selection", desc = "Move the contents of the selection",
help = help =
"Moves the contents of the selection.\n" + "Moves the contents of the selection.\n" +
"The -s flag shifts the selection to the target location.\n" + "The -s flag shifts the selection to the target location.\n" +
"The -a flag skips air blocks.\n" +
"Optionally fills the old location with <leave-id>.", "Optionally fills the old location with <leave-id>.",
min = 0, min = 0,
max = 3 max = 3
@ -278,9 +279,10 @@ public class RegionCommands {
@Optional("1") @Range(min = 1) int count, @Optional("1") @Range(min = 1) int count,
@Optional(Direction.AIM) @Direction(includeDiagonals = true) BlockVector3 direction, @Optional(Direction.AIM) @Direction(includeDiagonals = true) BlockVector3 direction,
@Optional("air") Pattern replace, @Optional("air") Pattern replace,
@Switch('s') boolean moveSelection) throws WorldEditException { @Switch('s') boolean moveSelection,
@Switch('a') boolean ignoreAirBlocks) throws WorldEditException {
int affected = editSession.moveRegion(region, direction, count, true, replace); int affected = editSession.moveRegion(region, direction, count, !ignoreAirBlocks, replace);
if (moveSelection) { if (moveSelection) {
try { try {

6
worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java
View File

@ -248,9 +248,9 @@ public class ForwardExtentCopy implements Operation {
} }
ExtentBlockCopy blockCopy = new ExtentBlockCopy(source, from, destination, to, currentTransform); ExtentBlockCopy blockCopy = new ExtentBlockCopy(source, from, destination, to, currentTransform);
RegionMaskingFilter filter = new RegionMaskingFilter(sourceMask, blockCopy); RegionMaskingFilter filteredFunction = new RegionMaskingFilter(sourceMask,
RegionFunction function = sourceFunction != null ? new CombinedRegionFunction(filter, sourceFunction) : filter; sourceFunction == null ? blockCopy : new CombinedRegionFunction(blockCopy, sourceFunction));
RegionVisitor blockVisitor = new RegionVisitor(region, function); RegionVisitor blockVisitor = new RegionVisitor(region, filteredFunction);
lastVisitor = blockVisitor; lastVisitor = blockVisitor;