diff --git a/build.gradle b/build.gradle
index 33a3e06..4396723 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,6 +14,11 @@ repositories {
         url = "https://mvn.theclashfruit.me/bukkit"
     }
 
+    maven {
+        name = "Spigot"
+        url = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/"
+    }
+
     maven {
         name = "Sonatype"
         url = "https://oss.sonatype.org/content/repositories/snapshots/"
@@ -24,7 +29,7 @@ dependencies {
     testImplementation platform('org.junit:junit-bom:5.9.1')
     testImplementation 'org.junit.jupiter:junit-jupiter'
 
-    shadow implementation("org.bukkit:craftbukkit:${project.bukkit_version}")
+    shadow implementation("org.spigotmc:spigot-api:${project.bukkit_version}")
 
     implementation 'org.eclipse.jetty:jetty-server:9.4.52.v20230823'
     implementation 'org.eclipse.jetty:jetty-servlet:9.4.52.v20230823'
@@ -66,9 +71,9 @@ tasks.register("launchMinecraftServer", JavaExec) {
             from(configurations.runtimeClasspath)
             into(layout.projectDirectory.file("run"))
 
-            include "craftbukkit*"
+            include "spigot*"
 
-            rename("craftbukkit-${project.bukkit_version}.jar", "server.jar")
+            // rename("spigot-${project.bukkit_version}.jar", "server.jar")
         }
     }
 }
diff --git a/gradle.properties b/gradle.properties
index ad78c21..39ae0c3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
-bukkit_version = 1.6.4-R2.0
-plugin_version = 1.1.0+mc1.6.4-alpha
\ No newline at end of file
+bukkit_version = 1.8.8-R0.1-SNAPSHOT
+plugin_version = 2.0.0-alpha+mc1.8.8
\ No newline at end of file
diff --git a/src/main/java/me/theclashfruit/crss/api/PlayersServlet.java b/src/main/java/me/theclashfruit/crss/api/PlayersServlet.java
index 949b4a9..8d3ea22 100644
--- a/src/main/java/me/theclashfruit/crss/api/PlayersServlet.java
+++ b/src/main/java/me/theclashfruit/crss/api/PlayersServlet.java
@@ -4,6 +4,7 @@ import com.google.gson.Gson;
 import me.theclashfruit.crss.models.PlayerList;
 import me.theclashfruit.crss.models.PlayerLocation;
 import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
@@ -19,18 +20,22 @@ public class PlayersServlet extends HttpServlet {
 
         Gson gson = new Gson();
         
-        PlayerList[] playerList = new PlayerList[Bukkit.getOnlinePlayers().length];
+        var onlinePlayers =Bukkit.getOnlinePlayers().toArray();
+        
+        PlayerList[] playerList = new PlayerList[onlinePlayers.length];
+
+        for (int i = 0; i < onlinePlayers.length; i++) {
+            Player player = (Player) onlinePlayers[i];
 
-        for (int i = 0; i < Bukkit.getOnlinePlayers().length; i++) {
             playerList[i] = new PlayerList(
-                Bukkit.getOnlinePlayers()[i].getUniqueId().toString(),
-                Bukkit.getOnlinePlayers()[i].getDisplayName(),
-                Bukkit.getOnlinePlayers()[i].getGameMode().getValue(),
-                Bukkit.getOnlinePlayers()[i].getWorld().getName(),
+                player.getUniqueId().toString(),
+                player.getDisplayName(),
+                player.getGameMode().getValue(),
+                player.getWorld().getName(),
                 new PlayerLocation(
-                    Bukkit.getOnlinePlayers()[i].getLocation().getX(),
-                    Bukkit.getOnlinePlayers()[i].getLocation().getY(),
-                    Bukkit.getOnlinePlayers()[i].getLocation().getZ()
+                    player.getLocation().getX(),
+                    player.getLocation().getY(),
+                    player.getLocation().getZ()
                 )
             );
         }
diff --git a/src/main/java/me/theclashfruit/crss/api/StatusServlet.java b/src/main/java/me/theclashfruit/crss/api/StatusServlet.java
index 5235c7e..a33ed0e 100644
--- a/src/main/java/me/theclashfruit/crss/api/StatusServlet.java
+++ b/src/main/java/me/theclashfruit/crss/api/StatusServlet.java
@@ -21,7 +21,7 @@ public class StatusServlet extends HttpServlet {
         Status status = new Status(
             true,
             Bukkit.getBukkitVersion(),
-            Bukkit.getOnlinePlayers().length,
+            Bukkit.getOnlinePlayers().toArray().length,
             Bukkit.getMaxPlayers(),
             Bukkit.getMotd()
         );
diff --git a/src/main/java/me/theclashfruit/crss/map/MapUtils.java b/src/main/java/me/theclashfruit/crss/map/MapUtils.java
index dfd7a08..90153ce 100644
--- a/src/main/java/me/theclashfruit/crss/map/MapUtils.java
+++ b/src/main/java/me/theclashfruit/crss/map/MapUtils.java
@@ -1,16 +1,14 @@
 package me.theclashfruit.crss.map;
 
 import me.theclashfruit.crss.util.FileUtil;
-import org.bukkit.craftbukkit.libs.jline.internal.InputStreamReader;
 import org.bukkit.plugin.Plugin;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
-import java.util.Arrays;
 
 import static org.bukkit.Bukkit.getLogger;
 import static org.bukkit.Bukkit.getServer;