Merge remote-tracking branch 'origin/main' into feat/spongeSchemV3

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/regions/WorldGuardFeature.java

@@ -1,5 +1,6 @@
 package com.fastasyncworldedit.bukkit.regions;
 
+import com.fastasyncworldedit.core.configuration.Settings;
 import com.fastasyncworldedit.core.regions.FaweMask;
 import com.fastasyncworldedit.core.regions.RegionWrapper;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
@@ -158,6 +159,9 @@ public class WorldGuardFeature extends BukkitMaskManager implements Listener {
 
     @Override
     public FaweMask getMask(com.sk89q.worldedit.entity.Player wePlayer, MaskType type, boolean isWhitelist) {
+        if (isWhitelist && Settings.settings().REGION_RESTRICTIONS_OPTIONS.WORLDGUARD_REGION_BLACKLIST) {
+            return new FaweMask(RegionWrapper.GLOBAL());
+        }
         final Player player = BukkitAdapter.adapt(wePlayer);
         final LocalPlayer localplayer = this.worldguard.wrapPlayer(player);
         final Location location = player.getLocation();

worldedit-core/src/main/java/com/sk89q/worldedit/regions/Region.java

@@ -482,7 +482,7 @@ public interface Region extends Iterable<BlockVector3>, Cloneable, IBatchProcess
             }
             return set;
         } else {
-            return null;
+            return set;
         }
     }
 

worldedit-core/src/main/java/com/sk89q/worldedit/regions/RegionIntersection.java

@@ -205,7 +205,7 @@ public class RegionIntersection extends AbstractRegion {
             BlockVector3 regMin = region.getMinimumPoint();
             BlockVector3 regMax = region.getMaximumPoint();
             if (tx >= regMin.x() && bx <= regMax.x() && tz >= regMin.z() && bz <= regMax.z()) {
-                return region.processSet(chunk, get, set, true);
+                set = region.processSet(chunk, get, set, true);
             }
         }
         return set; // default return set as no "blacklist" regions contained the chunk