From 102d13a3f63961ec2447bd44fe74425dfafb330f Mon Sep 17 00:00:00 2001 From: drtshock Date: Thu, 15 Jan 2015 13:29:14 -0600 Subject: [PATCH] Update to Worldguard 6.x. Resolves #214. This is a breaking change for anyone using Worldguard 5.x --- pom.xml | 4 ++-- .../com/massivecraft/factions/integration/Worldguard.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index da4eefc1..f777a2ad 100644 --- a/pom.xml +++ b/pom.xml @@ -86,12 +86,12 @@ com.sk89q worldguard - 5.9.1-SNAPSHOT + 6.0.0-SNAPSHOT com.sk89q worldedit - 5.6.3 + 6.0.0-SNAPSHOT net.ess3 diff --git a/src/main/java/com/massivecraft/factions/integration/Worldguard.java b/src/main/java/com/massivecraft/factions/integration/Worldguard.java index caf05e2b..5eeb1fb4 100644 --- a/src/main/java/com/massivecraft/factions/integration/Worldguard.java +++ b/src/main/java/com/massivecraft/factions/integration/Worldguard.java @@ -16,6 +16,7 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import java.util.Map; @@ -111,7 +112,7 @@ public class Worldguard { RegionManager regionManager = wg.getRegionManager(world); ProtectedCuboidRegion region = new ProtectedCuboidRegion("wgfactionoverlapcheck", minChunk, maxChunk); Map allregions = regionManager.getRegions(); - List allregionslist = new ArrayList(allregions.values()); + Collection allregionslist = new ArrayList(allregions.values()); List overlaps; boolean foundregions = false;