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

Merge branch 'merge' into 1.15

Browse Source
This commit is contained in:
NotMyFault
2019-12-19 19:05:27 +01:00
parent e12b26c96c ea5f7a77be
commit f37bc9417c
36 changed files with 323 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -312,7 +312,7 @@ public class EditSession extends PassthroughExtent implements AutoCloseable {
private final List<WatchdogTickingExtent> watchdogExtents = new ArrayList<>(2);
public void setExtent(AbstractDelegateExtent extent) {
new ExtentTraverser<>(getExtent()).setNext(extent);
new ExtentTraverser(this).setNext(extent);
}
/**
@ -483,7 +483,7 @@ public class EditSession extends PassthroughExtent implements AutoCloseable {
checkNotNull(transform);
wrapped = true;
transform.setExtent(getExtent());
new ExtentTraverser<>(getExtent()).setNext(transform);
new ExtentTraverser(this).setNext(transform);
}
public @Nullable ResettableExtent getTransform() {
@ -514,7 +514,7 @@ public class EditSession extends PassthroughExtent implements AutoCloseable {
maskingExtent.get().setMask(mask);
} else if (mask != Masks.alwaysTrue()) {
SourceMaskExtent next = new SourceMaskExtent(getExtent(), mask);
new ExtentTraverser<>(getExtent()).setNext(next);
new ExtentTraverser(this).setNext(next);
}
}
@ -553,8 +553,7 @@ public class EditSession extends PassthroughExtent implements AutoCloseable {
}
maskingExtent.get().setMask(mask);
} else if (mask != Masks.alwaysTrue()) {
MaskingExtent next = new MaskingExtent(getExtent(), mask);
new ExtentTraverser<>(getExtent()).setNext(next);
addProcessor(new MaskingExtent(getExtent(), mask));
}
}