diff --git a/.classpath b/.classpath
index 5a84bf1f..6b746735 100644
--- a/.classpath
+++ b/.classpath
@@ -11,6 +11,5 @@
 	<classpathentry kind="lib" path="C:/Users/Shawn/Documents/Bending Plugins/Towny.jar"/>
 	<classpathentry kind="lib" path="C:/Users/Shawn/Documents/Bending Plugins/WorldEdit.jar"/>
 	<classpathentry kind="lib" path="C:/Users/Shawn/Documents/Bending Plugins/WorldGuard.jar"/>
-	<classpathentry kind="lib" path="C:/Users/Shawn/Documents/LocalServer/Bending.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/src/com/projectkorra/ProjectKorra/MetricsLite.java b/src/com/projectkorra/ProjectKorra/MetricsLite.java
index 1e6f262d..683af9f3 100644
--- a/src/com/projectkorra/ProjectKorra/MetricsLite.java
+++ b/src/com/projectkorra/ProjectKorra/MetricsLite.java
@@ -284,7 +284,7 @@ public class MetricsLite {
 		boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE if online mode is 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
 
diff --git a/src/com/projectkorra/ProjectKorra/ProjectKorra.java b/src/com/projectkorra/ProjectKorra/ProjectKorra.java
index b9d1a4e0..29f19e52 100644
--- a/src/com/projectkorra/ProjectKorra/ProjectKorra.java
+++ b/src/com/projectkorra/ProjectKorra/ProjectKorra.java
@@ -58,7 +58,7 @@ public class ProjectKorra extends JavaPlugin {
 
 	@Override
 	public void onDisable() {
-		for (Player player: Bukkit.getOnlinePlayers()) {
+		for (Player player: Bukkit._INVALID_getOnlinePlayers()) {
 			Methods.saveBendingPlayer(player.getName());
 		}
 		Methods.stopBending();
diff --git a/src/com/projectkorra/ProjectKorra/RevertChecker.java b/src/com/projectkorra/ProjectKorra/RevertChecker.java
index a49369d4..21a86f01 100644
--- a/src/com/projectkorra/ProjectKorra/RevertChecker.java
+++ b/src/com/projectkorra/ProjectKorra/RevertChecker.java
@@ -7,6 +7,7 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Future;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
 import org.bukkit.Server;
 import org.bukkit.block.Block;
@@ -43,9 +44,9 @@ public class RevertChecker implements Runnable {
 		@Override
 		public ArrayList<Chunk> call() throws Exception {
 			ArrayList<Chunk> chunks = new ArrayList<Chunk>();
-			Player[] players = server.getOnlinePlayers();
 
-			for (Player player : players) {
+			
+			for (Player player : Bukkit._INVALID_getOnlinePlayers()) {
 				Chunk chunk = player.getLocation().getChunk();
 				if (!chunks.contains(chunk))
 					chunks.add(chunk);
diff --git a/src/com/projectkorra/ProjectKorra/chiblocking/ChiPassive.java b/src/com/projectkorra/ProjectKorra/chiblocking/ChiPassive.java
index 94639bdf..d3cb7a05 100644
--- a/src/com/projectkorra/ProjectKorra/chiblocking/ChiPassive.java
+++ b/src/com/projectkorra/ProjectKorra/chiblocking/ChiPassive.java
@@ -39,7 +39,7 @@ public class ChiPassive {
 	}
 	
 	public static void handlePassive() {
-		for (Player player: Bukkit.getOnlinePlayers()) {
+		for (Player player: Bukkit._INVALID_getOnlinePlayers()) {
 			if (Methods.canBendPassive(player.getName(), Element.Chi)) {
 				if (player.isSprinting()) {
 					if (!player.hasPotionEffect(PotionEffectType.JUMP)) {
@@ -56,20 +56,6 @@ public class ChiPassive {
 				if (Methods.getBendingPlayer(s) == null) continue;
 				Methods.getBendingPlayer(s).unblockChi();
 			}
-//			if (BendingPlayer.blockedChi.contains(player.getName())) {
-//				if (BendingPlayer.blockedChi.get(player.getName()) + duration < System.currentTimeMillis()) {
-//					BendingPlayer.blockedChi.remove(player.getName());
-//				} else {
-//				}
-//			}
 		}
-//		for (String s: BendingPlayer.blockedChi.keySet()) {
-//			if (BendingPlayer.blockedChi.get(s) + duration >= System.currentTimeMillis()) {
-//				Bukkit.getServer().broadcastMessage(s + "'s Chi is blocked.");
-//			} else {
-//				Bukkit.getServer().broadcastMessage(s + "'s Chi has been unblocked.");
-//				BendingPlayer.blockedChi.remove(s);
-//			}
-//		}
 	}
 }
diff --git a/src/plugin.yml b/src/plugin.yml
index 54b8c09b..2bd61bf4 100644
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -1,6 +1,6 @@
 name: ProjectKorra
 author: ProjectKorra
-version: 1.2.0 BETA 15
+version: 1.2.0 BETA 16
 main: com.projectkorra.ProjectKorra.ProjectKorra
 commands:
   projectkorra: