Add chunk support to "region contains"

Author: APickledWalrus

src/main/java/org/skriptlang/skriptworldguard/worldguard/RegionUtils.java

@@ -2,9 +2,6 @@
 
 import com.google.common.collect.Iterators;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
-import com.sk89q.worldedit.regions.AbstractRegion;
-import com.sk89q.worldedit.regions.CuboidRegion;
-import com.sk89q.worldedit.regions.Polygonal2DRegion;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.WorldGuard;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
@@ -13,8 +10,6 @@
 import com.sk89q.worldguard.protection.RegionResultSet;
 import com.sk89q.worldguard.protection.flags.Flags;
 import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
-import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import com.sk89q.worldguard.protection.regions.RegionContainer;
 import org.bukkit.Location;
@@ -177,18 +172,7 @@ private Iterator<Block> nextIterator() {
 				}
 				WorldGuardRegion region = regionIterator.next();
 				World world = region.world();
-				ProtectedRegion protectedRegion = region.region();
-				AbstractRegion adaptedRegion;
-				if (protectedRegion instanceof ProtectedPolygonalRegion polygonalRegion) { // Not as simple as a cube...
-					adaptedRegion = new Polygonal2DRegion(BukkitAdapter.adapt(world), polygonalRegion.getPoints(),
-							polygonalRegion.getMinimumPoint().getY(), polygonalRegion.getMaximumPoint().getY());
-				} else if (protectedRegion instanceof ProtectedCuboidRegion) {
-					adaptedRegion = new CuboidRegion(BukkitAdapter.adapt(region.world()),
-							protectedRegion.getMinimumPoint(), protectedRegion.getMaximumPoint());
-				} else {
-					throw new IllegalArgumentException("Unexpected region type: " + protectedRegion.getClass());
-				}
-				return Iterators.transform(adaptedRegion.iterator(),
+				return Iterators.transform(region.asWorldEditRegion().iterator(),
 						blockVector -> world.getBlockAt(blockVector.getX(), blockVector.getY(), blockVector.getZ()));
 			}
 

src/main/java/org/skriptlang/skriptworldguard/worldguard/WorldGuardRegion.java

@@ -3,7 +3,14 @@
 import ch.njol.skript.lang.util.common.AnyContains;
 import ch.njol.skript.lang.util.common.AnyNamed;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldedit.math.BlockVector2;
+import com.sk89q.worldedit.regions.CuboidRegion;
+import com.sk89q.worldedit.regions.Polygonal2DRegion;
+import com.sk89q.worldedit.regions.Region;
+import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.jetbrains.annotations.NotNull;
@@ -65,6 +72,10 @@ public String name() {
 
 	@Override
 	public boolean contains(Object object) {
+		if (object instanceof Chunk chunk) {
+			BlockVector2 chunkVector = BlockVector2.at(chunk.getX(), chunk.getZ());
+			return asWorldEditRegion().getChunks().contains(chunkVector);
+		}
 		Location location = Converters.convert(object, Location.class);
 		return location != null && region.contains(BukkitAdapter.asBlockVector(location));
 	}
@@ -74,4 +85,27 @@ public boolean isSafeToCheck(Object value) {
 		return value != null;
 	}
 
+	/*
+	 * Utility
+	 */
+
+	/**
+	 * Converts this region into a WorldEdit {@link Region}.
+	 * @return A region representing the physical area of this region.
+	 * @throws IllegalArgumentException If this region does not encompass a physical area ({@link ProtectedRegion#isPhysicalArea()}).
+	 */
+	public Region asWorldEditRegion() {
+		Region worldEditRegion;
+		if (region instanceof ProtectedPolygonalRegion polygonalRegion) { // Not as simple as a cube...
+			worldEditRegion = new Polygonal2DRegion(BukkitAdapter.adapt(world), polygonalRegion.getPoints(),
+					polygonalRegion.getMinimumPoint().getY(), polygonalRegion.getMaximumPoint().getY());
+		} else if (region instanceof ProtectedCuboidRegion) {
+			worldEditRegion = new CuboidRegion(BukkitAdapter.adapt(world),
+					region.getMinimumPoint(), region.getMaximumPoint());
+		} else {
+			throw new IllegalArgumentException("Unexpected region type: " + region.getClass());
+		}
+		return worldEditRegion;
+	}
+
 }