Update to support 7.0.0-beta-2 (no longer good on earlier)

master 1.1-alpha-2
Mike Primm 7 years ago
parent 09c4b58bd9
commit c56f973ca3
  1. 10
      pom.xml
  2. 13
      src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java
  3. BIN
      worldedit-bukkit-7.0.0-SNAPSHOT-dist.jar
  4. BIN
      worldedit-bukkit-7.0.0-beta-04.jar
  5. BIN
      worldguard-legacy-7.0.0-beta-02.jar

@ -61,17 +61,17 @@
<dependency> <dependency>
<groupId>com.sk89q</groupId> <groupId>com.sk89q</groupId>
<artifactId>WorldGuard</artifactId> <artifactId>WorldGuard</artifactId>
<version>7.0.0-SNAPSHOT</version> <version>7.0.0-beta-02</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${project.basedir}/worldguard-legacy-7.0.0-SNAPSHOT-dist.jar</systemPath> <systemPath>${project.basedir}/worldguard-legacy-7.0.0-beta-02.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sk89q</groupId> <groupId>com.sk89q</groupId>
<artifactId>WorldEdit</artifactId> <artifactId>WorldEdit</artifactId>
<version>7.0.0-SNAPSHOT</version> <version>7.0.0-beta-04</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${project.basedir}/worldedit-bukkit-7.0.0-SNAPSHOT-dist.jar</systemPath> <systemPath>${project.basedir}/worldedit-bukkit-7.0.0-beta-04.jar</systemPath>
</dependency> </dependency>
</dependencies> </dependencies>
<version>1.1-alpha-1</version> <version>1.1-alpha-2</version>
</project> </project>

@ -26,8 +26,8 @@ import org.dynmap.markers.AreaMarker;
import org.dynmap.markers.MarkerAPI; import org.dynmap.markers.MarkerAPI;
import org.dynmap.markers.MarkerSet; import org.dynmap.markers.MarkerSet;
import com.sk89q.worldedit.BlockVector; import com.sk89q.worldedit.math.BlockVector2;
import com.sk89q.worldedit.BlockVector2D; import com.sk89q.worldedit.math.BlockVector3;
import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.World;
import com.sk89q.worldguard.WorldGuard; import com.sk89q.worldguard.WorldGuard;
import com.sk89q.worldguard.bukkit.WorldGuardPlugin; 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.internal.platform.WorldGuardPlatform;
import com.sk89q.worldguard.protection.flags.BooleanFlag; import com.sk89q.worldguard.protection.flags.BooleanFlag;
import com.sk89q.worldguard.protection.flags.Flag; 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.flags.registry.FlagRegistry;
import com.sk89q.worldguard.protection.managers.RegionManager; import com.sk89q.worldguard.protection.managers.RegionManager;
import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion; import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion;
@ -244,8 +243,8 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
if(isVisible(region.getId(), world.getName())) { if(isVisible(region.getId(), world.getName())) {
String id = region.getId(); String id = region.getId();
RegionType tn = region.getType(); RegionType tn = region.getType();
BlockVector l0 = region.getMinimumPoint(); BlockVector3 l0 = region.getMinimumPoint();
BlockVector l1 = region.getMaximumPoint(); BlockVector3 l1 = region.getMaximumPoint();
if(tn == RegionType.CUBOID) { /* Cubiod region? */ if(tn == RegionType.CUBOID) { /* Cubiod region? */
/* Make outline */ /* Make outline */
@ -258,11 +257,11 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
} }
else if(tn == RegionType.POLYGON) { else if(tn == RegionType.POLYGON) {
ProtectedPolygonalRegion ppr = (ProtectedPolygonalRegion)region; ProtectedPolygonalRegion ppr = (ProtectedPolygonalRegion)region;
List<BlockVector2D> points = ppr.getPoints(); List<BlockVector2> points = ppr.getPoints();
x = new double[points.size()]; x = new double[points.size()];
z = new double[points.size()]; z = new double[points.size()];
for(int i = 0; i < points.size(); i++) { 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(); x[i] = pt.getX(); z[i] = pt.getZ();
} }
} }

Loading…
Cancel
Save