From 3181b1db7142c98902746205e3f29218fa6e055f Mon Sep 17 00:00:00 2001
From: Sauilitired <citymonstret@hotmail.com>
Date: Tue, 28 Oct 2014 10:46:29 +0100
Subject: [PATCH] Fixed errors!!!!

---
 PlotSquared/PlotSquared.iml                   | 10 +++++-
 PlotSquared/pom.xml                           | 10 +++---
 .../intellectualcrafters/plot/Metrics.java    | 31 ++++++-------------
 .../intellectualcrafters/plot/PlotMain.java   | 14 +--------
 4 files changed, 24 insertions(+), 41 deletions(-)

diff --git a/PlotSquared/PlotSquared.iml b/PlotSquared/PlotSquared.iml
index 00d921f84..8a3beb671 100644
--- a/PlotSquared/PlotSquared.iml
+++ b/PlotSquared/PlotSquared.iml
@@ -20,7 +20,15 @@
     <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
     <orderEntry type="library" name="Maven: me.confuser:BarAPI:2.0" level="project" />
     <orderEntry type="library" name="Maven: com.sk89q:worldguard:5.9" level="project" />
-    <orderEntry type="library" name="Maven: com.worldcretornica:PlotMe-Core:0.14-SNAPSHOT" level="project" />
+    <orderEntry type="module-library">
+      <library name="Maven: com.worldcretornica:PlotMe:0.13d-SNAPSHOT">
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/lib/plotme-0.13f.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>
 
diff --git a/PlotSquared/pom.xml b/PlotSquared/pom.xml
index 91d6984e6..d529daca8 100644
--- a/PlotSquared/pom.xml
+++ b/PlotSquared/pom.xml
@@ -44,10 +44,6 @@
             <id>confuser-repo</id>
             <url>http://ci.frostcast.net/plugin/repository/everything</url>
         </repository>
-        <repository>
-            <id>hawkfalcon-repo</id>
-            <url>http://ci.hawkfalcon.com/plugin/repository/everything/</url>
-        </repository>
         <repository>
             <id>sk80q</id>
             <url>http://maven.sk89q.com/artifactory/repo/</url>
@@ -89,8 +85,10 @@
         </dependency>
         <dependency>
             <groupId>com.worldcretornica</groupId>
-            <artifactId>PlotMe-Core</artifactId>
-            <version>0.14-SNAPSHOT</version>
+            <artifactId>PlotMe</artifactId>
+            <version>0.13d-SNAPSHOT</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/plotme-0.13f.jar</systemPath>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/Metrics.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/Metrics.java
index af3fda2cd..8df772230 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/Metrics.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/Metrics.java
@@ -29,26 +29,6 @@ package com.intellectualcrafters.plot;
  * representing official policies, either expressed or implied, of anybody else.
  */
 
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.Proxy;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.UUID;
-import java.util.logging.Level;
-import java.util.zip.GZIPOutputStream;
-
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
@@ -56,6 +36,15 @@ import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.scheduler.BukkitTask;
 
+import java.io.*;
+import java.net.Proxy;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLEncoder;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.zip.GZIPOutputStream;
+
 public class Metrics {
 	/**
 	 * The current revision number
@@ -337,7 +326,7 @@ public class Metrics {
 		// enabled
 		String pluginVersion = description.getVersion();
 		String serverVersion = Bukkit.getVersion();
-		int playersOnline = Bukkit.getServer().getOnlinePlayers().length;
+		int playersOnline = Bukkit.getServer().getOnlinePlayers().size();
 		// END server software specific section -- all code below does not use
 		// any code outside of this class / Java
 		// Construct the post data
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotMain.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotMain.java
index 119d1b316..f73f387de 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotMain.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/PlotMain.java
@@ -8,10 +8,7 @@
 
 package com.intellectualcrafters.plot;
 
-import ca.mera.CameraAPI;
-
 import com.intellectualcrafters.plot.Logger.LogLevel;
-import com.intellectualcrafters.plot.commands.Camera;
 import com.intellectualcrafters.plot.commands.MainCommand;
 import com.intellectualcrafters.plot.database.*;
 import com.intellectualcrafters.plot.events.PlayerTeleportToPlotEvent;
@@ -102,10 +99,6 @@ public class PlotMain extends JavaPlugin {
 	 * BarAPI object
 	 */
 	public static BarAPI barAPI = null;
-	/**
-	 * CameraAPI object
-	 */
-	public static CameraAPI cameraAPI;
 
 	public static WorldGuardPlugin worldGuard = null;
 	public static WorldGuardListener worldGuardListener = null;
@@ -690,12 +683,7 @@ public class PlotMain extends JavaPlugin {
 
         defaultFlags();
 
-		if (getServer().getPluginManager().getPlugin("CameraAPI") != null) {
-			cameraAPI = CameraAPI.getInstance();
-			Camera camera = new Camera();
-			MainCommand.subCommands.add(camera);
-			getServer().getPluginManager().registerEvents(camera, this);
-		}
+
 		if (getServer().getPluginManager().getPlugin("BarAPI") != null) {
 			barAPI = (BarAPI) getServer().getPluginManager().getPlugin("BarAPI");
 		}