diff --git a/pom.xml b/pom.xml index 221a4e1..672118c 100644 --- a/pom.xml +++ b/pom.xml @@ -61,17 +61,17 @@ com.sk89q WorldGuard - 7.0.0-SNAPSHOT + 7.0.0-beta-02 system - ${project.basedir}/worldguard-legacy-7.0.0-SNAPSHOT-dist.jar + ${project.basedir}/worldguard-legacy-7.0.0-beta-02.jar com.sk89q WorldEdit - 7.0.0-SNAPSHOT + 7.0.0-beta-04 system - ${project.basedir}/worldedit-bukkit-7.0.0-SNAPSHOT-dist.jar + ${project.basedir}/worldedit-bukkit-7.0.0-beta-04.jar - 1.1-alpha-1 + 1.1-alpha-2 \ No newline at end of file diff --git a/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java b/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java index 3dbf9d6..4f60c1e 100644 --- a/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java +++ b/src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java @@ -26,8 +26,8 @@ import org.dynmap.markers.AreaMarker; import org.dynmap.markers.MarkerAPI; import org.dynmap.markers.MarkerSet; -import com.sk89q.worldedit.BlockVector; -import com.sk89q.worldedit.BlockVector2D; +import com.sk89q.worldedit.math.BlockVector2; +import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.world.World; import com.sk89q.worldguard.WorldGuard; import com.sk89q.worldguard.bukkit.WorldGuardPlugin; @@ -36,7 +36,6 @@ import com.sk89q.worldguard.domains.PlayerDomain; import com.sk89q.worldguard.internal.platform.WorldGuardPlatform; import com.sk89q.worldguard.protection.flags.BooleanFlag; import com.sk89q.worldguard.protection.flags.Flag; -import com.sk89q.worldguard.protection.flags.Flags; import com.sk89q.worldguard.protection.flags.registry.FlagRegistry; import com.sk89q.worldguard.protection.managers.RegionManager; import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion; @@ -244,8 +243,8 @@ public class DynmapWorldGuardPlugin extends JavaPlugin { if(isVisible(region.getId(), world.getName())) { String id = region.getId(); RegionType tn = region.getType(); - BlockVector l0 = region.getMinimumPoint(); - BlockVector l1 = region.getMaximumPoint(); + BlockVector3 l0 = region.getMinimumPoint(); + BlockVector3 l1 = region.getMaximumPoint(); if(tn == RegionType.CUBOID) { /* Cubiod region? */ /* Make outline */ @@ -258,11 +257,11 @@ public class DynmapWorldGuardPlugin extends JavaPlugin { } else if(tn == RegionType.POLYGON) { ProtectedPolygonalRegion ppr = (ProtectedPolygonalRegion)region; - List points = ppr.getPoints(); + List points = ppr.getPoints(); x = new double[points.size()]; z = new double[points.size()]; for(int i = 0; i < points.size(); i++) { - BlockVector2D pt = points.get(i); + BlockVector2 pt = points.get(i); x[i] = pt.getX(); z[i] = pt.getZ(); } } diff --git a/worldedit-bukkit-7.0.0-SNAPSHOT-dist.jar b/worldedit-bukkit-7.0.0-SNAPSHOT-dist.jar deleted file mode 100644 index 1b5b20f..0000000 Binary files a/worldedit-bukkit-7.0.0-SNAPSHOT-dist.jar and /dev/null differ diff --git a/worldedit-bukkit-7.0.0-beta-04.jar b/worldedit-bukkit-7.0.0-beta-04.jar new file mode 100644 index 0000000..d718515 Binary files /dev/null and b/worldedit-bukkit-7.0.0-beta-04.jar differ diff --git a/worldguard-legacy-7.0.0-SNAPSHOT-dist.jar b/worldguard-legacy-7.0.0-beta-02.jar similarity index 58% rename from worldguard-legacy-7.0.0-SNAPSHOT-dist.jar rename to worldguard-legacy-7.0.0-beta-02.jar index 3e2310a..729457b 100644 Binary files a/worldguard-legacy-7.0.0-SNAPSHOT-dist.jar and b/worldguard-legacy-7.0.0-beta-02.jar differ