From 6d01a013c6247a96356257f21337e99ff8cc3479 Mon Sep 17 00:00:00 2001
From: Pierre Maurice Schwang <mail@pschwang.eu>
Date: Mon, 16 Dec 2024 23:03:50 +0100
Subject: [PATCH] chore: unnecessary Extent in RegionMaskingFilter

---
 .../worldedit/command/BiomeCommands.java      |  2 +-
 .../com/sk89q/worldedit/extent/Extent.java    |  2 +-
 .../function/RegionMaskingFilter.java         | 29 +++++++++++--------
 .../function/operation/ForwardExtentCopy.java |  4 +--
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java
index 1f551aefa..a965f05b3 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BiomeCommands.java
@@ -206,7 +206,7 @@ public class BiomeCommands {
 
         RegionFunction replace = new BiomeReplace(editSession, target);
         if (mask != null) {
-            replace = new RegionMaskingFilter(editSession, mask, replace);
+            replace = new RegionMaskingFilter(mask, replace);
         }
         RegionVisitor visitor = new RegionVisitor(region, replace);
         Operations.completeLegacy(visitor);
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/Extent.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/Extent.java
index 9f73c8f5e..1dccfdc49 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/Extent.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/Extent.java
@@ -818,7 +818,7 @@ public interface Extent extends InputExtent, OutputExtent {
         checkNotNull(pattern);
 
         BlockReplace replace = new BlockReplace(this, pattern);
-        RegionMaskingFilter filter = new RegionMaskingFilter(this, mask, replace);
+        RegionMaskingFilter filter = new RegionMaskingFilter(mask, replace);
         //FAWE start > add extent to RegionVisitor to allow chunk preloading
         RegionVisitor visitor = new RegionVisitor(region, filter, this);
         //FAWE end
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/RegionMaskingFilter.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/RegionMaskingFilter.java
index f9c1f0216..f5c536370 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/RegionMaskingFilter.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/RegionMaskingFilter.java
@@ -35,9 +35,19 @@ public class RegionMaskingFilter implements RegionFunction {
 
     private final RegionFunction function;
     private final Mask mask;
-    //FAWE start
-    private final Extent extent;
-    //FAWE end
+
+    /**
+     * Create a new masking filter.
+     *
+     * @param mask the mask
+     * @param function the function
+     */
+    public RegionMaskingFilter(Mask mask, RegionFunction function) {
+        checkNotNull(function);
+        checkNotNull(mask);
+        this.mask = mask;
+        this.function = function;
+    }
 
     /**
      * Create a new masking filter.
@@ -46,16 +56,11 @@ public class RegionMaskingFilter implements RegionFunction {
      * @param function the function
      */
     //FAWE start - Extent
-    public RegionMaskingFilter(Extent extent, Mask mask, RegionFunction function) {
-        checkNotNull(function);
-        checkNotNull(mask);
-        //FAWE start
-        checkNotNull(extent);
-        this.extent = extent;
-        //FAWE end
-        this.mask = mask;
-        this.function = function;
+    @Deprecated(since = "TODO")
+    public RegionMaskingFilter(@SuppressWarnings("unused") Extent extent, Mask mask, RegionFunction function) {
+        this(mask, function);
     }
+    //FAWE end - Extent
 
     @Override
     public boolean apply(BlockVector3 position) throws WorldEditException {
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java
index f98d5f924..e6acdacff 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ForwardExtentCopy.java
@@ -330,7 +330,7 @@ public class ForwardExtentCopy implements Operation {
                 }
                 if (sourceMask != Masks.alwaysTrue()) {
                     new MaskTraverser(sourceMask).reset(transExt);
-                    copy = new RegionMaskingFilter(source, sourceMask, copy);
+                    copy = new RegionMaskingFilter(sourceMask, copy);
                 }
                 if (copyingBiomes && (source.isWorld() || region instanceof FlatRegion)) {
                     copy = CombinedRegionFunction.combine(copy, new BiomeCopy(source, finalDest));
@@ -394,7 +394,7 @@ public class ForwardExtentCopy implements Operation {
                 if (maskFunc != null) {
                     copy = new RegionMaskTestFunction(sourceMask, copy, maskFunc);
                 } else {
-                    copy = new RegionMaskingFilter(source, sourceMask, copy);
+                    copy = new RegionMaskingFilter(sourceMask, copy);
                 }
             }
             if (copyingBiomes && (source.isWorld() || region instanceof FlatRegion)) {