Update to WorldGuard 6.0.0

pom.xml

@@ -65,21 +65,21 @@
   	<dependency>
   		<groupId>org.bukkit</groupId>
   		<artifactId>bukkit</artifactId>
-  		<version>1.7.9-R0.2</version>
+  		<version>1.7.10-R0.1-SNAPSHOT</version>
   	</dependency>
   	<dependency>
   		<groupId>com.sk89q</groupId>
   		<artifactId>WorldGuard</artifactId>
-  		<version>5.9</version>
+  		<version>6.0.0-SNAPSHOT</version>
   		<scope>system</scope>
-  		<systemPath>${project.basedir}/worldguard-5.9.jar</systemPath>
+  		<systemPath>${project.basedir}/worldguard-6.0.0-SNAPSHOT.jar</systemPath>
   	</dependency>
   	<dependency>
   		<groupId>com.sk89q</groupId>
   		<artifactId>WorldEdit</artifactId>
-  		<version>5.6.3</version>
+  		<version>6.0.0-SNAPSHOT</version>
   		<scope>system</scope>
-  		<systemPath>${project.basedir}/WorldEdit-5.6.3.jar</systemPath>
+  		<systemPath>${project.basedir}/WorldEdit-6.0.0-SNAPSHOT.jar</systemPath>
   	</dependency>
   	<dependency>
   		<groupId>com.sk89q</groupId>

src/main/java/org/dynmap/worldguard/DynmapWorldGuardPlugin.java

@@ -35,6 +35,7 @@ import com.sk89q.worldguard.protection.flags.Flag;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import com.sk89q.worldguard.protection.regions.RegionType;
 
 public class DynmapWorldGuardPlugin extends JavaPlugin {
     private static Logger log;
@@ -211,11 +212,11 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
         /* Handle areas */
         if(isVisible(region.getId(), world.getName())) {
             String id = region.getId();
-            String tn = region.getTypeName();
+            RegionType tn = region.getType();
             BlockVector l0 = region.getMinimumPoint();
             BlockVector l1 = region.getMaximumPoint();
 
-            if(tn.equalsIgnoreCase("cuboid")) { /* Cubiod region? */
+            if(tn == RegionType.CUBOID) { /* Cubiod region? */
                 /* Make outline */
                 x = new double[4];
                 z = new double[4];
@@ -224,7 +225,7 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
                 x[2] = l1.getX() + 1.0; z[2] = l1.getZ()+1.0;
                 x[3] = l1.getX() + 1.0; z[3] = l0.getZ();
             }
-            else if(tn.equalsIgnoreCase("polygon")) {
+            else if(tn == RegionType.POLYGON) {
                 ProtectedPolygonalRegion ppr = (ProtectedPolygonalRegion)region;
                 List<BlockVector2D> points = ppr.getPoints();
                 x = new double[points.size()];
@@ -324,7 +325,6 @@ public class DynmapWorldGuardPlugin extends JavaPlugin {
     }
 
     private class OurServerListener implements Listener {
-        @SuppressWarnings("unused")
         @EventHandler(priority=EventPriority.MONITOR)
         public void onPluginEnable(PluginEnableEvent event) {
             Plugin p = event.getPlugin();

src/main/java/org/dynmap/worldguard/MetricsLite.java

@@ -33,6 +33,7 @@ import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
+import org.bukkit.scheduler.BukkitTask;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -97,7 +98,7 @@ public class MetricsLite {
     /**
      * Id of the scheduled task
      */
-    private volatile int taskId = -1;
+    private volatile BukkitTask taskId = null;
 
     public MetricsLite(Plugin plugin) throws IOException {
         if (plugin == null) {
@@ -139,12 +140,12 @@ public class MetricsLite {
             }
 
             // Is metrics already running?
-            if (taskId >= 0) {
+            if (taskId != null) {
                 return true;
             }
 
             // Begin hitting the server with glorious data
-            taskId = plugin.getServer().getScheduler().scheduleAsyncRepeatingTask(plugin, new Runnable() {
+            taskId = plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, new Runnable() {
 
                 private boolean firstPost = true;
 
@@ -153,9 +154,9 @@ public class MetricsLite {
                         // This has to be synchronized or it can collide with the disable method.
                         synchronized (optOutLock) {
                             // Disable Task, if it is running and the server owner decided to opt-out
-                            if (isOptOut() && taskId > 0) {
-                                plugin.getServer().getScheduler().cancelTask(taskId);
-                                taskId = -1;
+                            if (isOptOut() && (taskId != null)) {
+                                taskId.cancel();
+                                taskId = null;
                             }
                         }
 
@@ -213,7 +214,7 @@ public class MetricsLite {
             }
 
             // Enable Task, if it is not running
-            if (taskId < 0) {
+            if (taskId == null) {
                 start();
             }
         }
@@ -234,9 +235,9 @@ public class MetricsLite {
             }
 
             // Disable Task, if it is running
-            if (taskId > 0) {
-                this.plugin.getServer().getScheduler().cancelTask(taskId);
-                taskId = -1;
+            if (taskId != null) {
+                taskId.cancel();
+                taskId = null;
             }
         }
     }
@@ -270,7 +271,7 @@ public class MetricsLite {
         data.append(encode("guid")).append('=').append(encode(guid));
         encodeDataPair(data, "version", description.getVersion());
         encodeDataPair(data, "server", Bukkit.getVersion());
-        encodeDataPair(data, "players", Integer.toString(Bukkit.getServer().getOnlinePlayers().length));
+        encodeDataPair(data, "players", Integer.toString(Bukkit.getServer().getOnlinePlayers().size()));
         encodeDataPair(data, "revision", String.valueOf(REVISION));
 
         // If we're pinging, append it