Various minor

Disable P2's we region restrictions (so that it uses FAWE's)
Fix extent binding
Fix filtering on null sections
This commit is contained in:
Jesse Boyd
2019-11-11 16:49:13 +00:00
parent 9d6f2df908
commit 7aa0d9c122
19 changed files with 77 additions and 58 deletions

View File

@ -652,7 +652,7 @@ public interface Extent extends InputExtent, OutputExtent {
return this;
}
default <T extends Filter> T apply(Region region, T filter) {
default <T extends Filter> T apply(Region region, T filter, boolean full) {
return apply((Iterable<BlockVector3>) region, filter);
}

View File

@ -1,5 +1,6 @@
package com.sk89q.worldedit.extent;
import com.boydti.fawe.beta.Filter;
import com.boydti.fawe.beta.IBatchProcessor;
import com.boydti.fawe.object.changeset.FaweChangeSet;
import com.sk89q.jnbt.CompoundTag;
@ -250,4 +251,14 @@ public class PassthroughExtent extends AbstractDelegateExtent {
public boolean isWorld() {
return getExtent().isWorld();
}
@Override
public <T extends Filter> T apply(Region region, T filter, boolean full) {
return getExtent().apply(region, filter, full);
}
@Override
public <T extends Filter> T apply(Iterable<BlockVector3> positions, T filter) {
return getExtent().apply(positions, filter);
}
}

View File

@ -172,7 +172,7 @@ public interface Clipboard extends Extent, Iterable<BlockVector3>, Closeable {
// }
@Override
default <T extends Filter> T apply(Region region, T filter) {
default <T extends Filter> T apply(Region region, T filter, boolean full) {
if (region.equals(getRegion())) {
return apply(this, filter);
} else {