Merge branch 'dev' into 'master'

2.0.3

See merge request ajg0702/ajqueue!21

api/build.gradle.kts

@@ -17,7 +17,7 @@ dependencies {
     implementation("net.kyori:adventure-text-serializer-plain:4.0.0-SNAPSHOT")
     compileOnly("com.google.guava:guava:30.1.1-jre")
 
-    compileOnly("us.ajg0702:ajUtils:1.1.8")
+    compileOnly("us.ajg0702:ajUtils:1.1.9")
 }
 
 publishing {

build.gradle.kts

@@ -11,9 +11,14 @@ repositories {
 }
 
 allprojects {
-    version = "2.0.2"
+    version = "2.0.3"
     group = "us.ajg0702"
 
+    plugins.apply("java")
+    java {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+    }
+
     tasks.withType<Test>().configureEach {
         useJUnitPlatform()
 

common/build.gradle.kts

@@ -16,7 +16,7 @@ dependencies {
     compileOnly("net.kyori:adventure-text-serializer-plain:4.0.0-SNAPSHOT")
 
     compileOnly("com.google.guava:guava:30.1.1-jre")
-    compileOnly("us.ajg0702:ajUtils:1.1.8")
+    compileOnly("us.ajg0702:ajUtils:1.1.9")
 
     compileOnly("org.slf4j:slf4j-log4j12:1.7.29")
 

common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java

@@ -231,6 +231,11 @@ public class QueueManagerImpl implements QueueManager {
                 continue;
             }
 
+            if(!groupRaw.contains(":")) {
+                main.getLogger().warning("Incorrect formatting! Each server group needs to have a name and a list of servers seperated by a colon (:).");
+                continue;
+            }
+
             String groupName = groupRaw.split(":")[0];
             String[] serversraw = groupRaw.split(":")[1].split(",");
 
@@ -466,6 +471,9 @@ public class QueueManagerImpl implements QueueManager {
                     }
                 } else {
                     i++;
+                    if(i > server.getQueue().size()-1) {
+                        break;
+                    }
                     nextQueuePlayer = server.getQueue().get(i);
                     nextPlayer = nextQueuePlayer.getPlayer();
                 }

common/src/main/resources/config.yml

@@ -1,5 +1,5 @@
 # Dont touch this number please
-config-version: 23
+config-version: 24
 
 # The time the server will wait between sending people in the queue
 #  Default: 5

free/build.gradle.kts

@@ -18,7 +18,7 @@ dependencies {
     compileOnly("com.google.guava:guava:30.1.1-jre")
     compileOnly("org.spongepowered:configurate-yaml:4.0.0")
 
-    implementation("us.ajg0702:ajUtils:1.1.8")
+    implementation("us.ajg0702:ajUtils:1.1.9")
 
     implementation(project(":platforms:velocity"))
     implementation(project(":platforms:bungeecord"))

platforms/bungeecord/build.gradle.kts

@@ -15,7 +15,7 @@ repositories {
 dependencies {
     compileOnly("net.kyori:adventure-api:4.8.1")
     compileOnly("com.google.guava:guava:30.1.1-jre")
-    compileOnly("us.ajg0702:ajUtils:1.1.8")
+    compileOnly("us.ajg0702:ajUtils:1.1.9")
 
     compileOnly("net.md-5:bungeecord-api:1.16-R0.4")
 

platforms/velocity/build.gradle.kts

@@ -15,7 +15,7 @@ repositories {
 dependencies {
     compileOnly("net.kyori:adventure-api:4.8.1")
     compileOnly("com.google.guava:guava:30.1.1-jre")
-    compileOnly("us.ajg0702:ajUtils:1.1.8")
+    compileOnly("us.ajg0702:ajUtils:1.1.9")
 
     compileOnly("com.velocitypowered:velocity-api:3.0.0")
     annotationProcessor("com.velocitypowered:velocity-api:3.0.0")

premium/build.gradle.kts

@@ -22,7 +22,7 @@ dependencies {
 
     compileOnly("com.google.guava:guava:30.1.1-jre")
 
-    compileOnly("us.ajg0702:ajUtils:1.1.8")
+    compileOnly("us.ajg0702:ajUtils:1.1.9")
 
     compileOnly("net.kyori:adventure-api:4.8.1")
 

spigot/build.gradle.kts

@@ -22,7 +22,7 @@ dependencies {
 
     compileOnly("org.spongepowered:configurate-yaml:4.0.0")
 
-    compileOnly("us.ajg0702:ajUtils:1.1.8")
+    compileOnly("us.ajg0702:ajUtils:1.1.9")
 
     compileOnly(group = "org.spigotmc", name = "spigot", version = "1.16.5-R0.1-SNAPSHOT")
     compileOnly("me.clip:placeholderapi:2.10.4")