From da801ef3b1791f36bf4712ac315222bdede314a1 Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Sun, 9 Jun 2024 19:43:11 +0100 Subject: [PATCH] cleanup --- .../src/main/java/com/sk89q/worldedit/LocalSession.java | 2 +- .../java/com/sk89q/worldedit/command/tool/brush/Brush.java | 2 ++ .../com/sk89q/worldedit/extent/AbstractDelegateExtent.java | 5 ----- .../main/java/com/sk89q/worldedit/extent/MaskingExtent.java | 2 -- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java b/worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java index 88183adae..26e7b4c71 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/LocalSession.java @@ -1724,6 +1724,7 @@ public class LocalSession implements TextureHolder { * @return an edit session */ public EditSession createEditSession(Actor actor) { + //FAWE start return createEditSession(actor, null); } @@ -1752,7 +1753,6 @@ public class LocalSession implements TextureHolder { } // Create an edit session - //FAWE start - we don't use the edit session builder yet EditSession editSession; EditSessionBuilder builder = WorldEdit.getInstance().newEditSessionBuilder().world(world); if (actor.isPlayer() && actor instanceof Player) { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/Brush.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/Brush.java index 862bb6d1c..e38ae0d99 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/Brush.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/Brush.java @@ -40,6 +40,7 @@ public interface Brush { */ void build(EditSession editSession, BlockVector3 position, Pattern pattern, double size) throws MaxChangedBlocksException; + //FAWE start /** * If this brush is expected to set blocks synchronously, i.e. from one thread (at a time) * @@ -48,5 +49,6 @@ public interface Brush { default boolean setsSynchronously() { return true; } + //FAWE end } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/AbstractDelegateExtent.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/AbstractDelegateExtent.java index 8b8b80284..f2d7dc884 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/AbstractDelegateExtent.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/AbstractDelegateExtent.java @@ -361,11 +361,6 @@ public class AbstractDelegateExtent implements Extent { public T apply(final Region region, final T filter, final boolean full) { return extent.apply(region, filter, full); } - - @Override - public T apply(final Iterable positions, final T filter) { - return extent.apply(positions, filter); - } //FAWE end protected Operation commitBefore() { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/MaskingExtent.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/MaskingExtent.java index 3d1f7dcda..64b6eecc3 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/MaskingExtent.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/MaskingExtent.java @@ -30,7 +30,6 @@ import com.fastasyncworldedit.core.queue.IChunk; import com.fastasyncworldedit.core.queue.IChunkGet; import com.fastasyncworldedit.core.queue.IChunkSet; import com.sk89q.worldedit.WorldEditException; -import com.sk89q.worldedit.function.mask.AbstractExtentMask; import com.sk89q.worldedit.function.mask.Mask; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.world.biome.BiomeType; @@ -47,7 +46,6 @@ public class MaskingExtent extends AbstractDelegateExtent implements IBatchProce //FAWE start private final LongFunction getOrCreateFilterBlock; - private AbstractExtentMask extentMask; private Mask mask; //FAWE end