From fbb6d94596acfb50e264f3ed723ab53d6bd91b0f Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Mon, 9 Aug 2021 12:55:14 -0700 Subject: [PATCH 1/5] warn if no colon in server group --- .../main/java/us/ajg0702/queue/common/QueueManagerImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java b/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java index dbe2ac5..2bfcc41 100644 --- a/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java +++ b/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(","); From 86ceaa023316cb98af75486b8aa6f944bbaf1427 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Fri, 13 Aug 2021 11:57:19 -0700 Subject: [PATCH 2/5] attempt to always have java 8 compatability --- build.gradle.kts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 2f77b7c..89d84aa 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,6 +14,11 @@ allprojects { version = "2.0.2" group = "us.ajg0702" + plugins.apply("java") + java { + sourceCompatibility = JavaVersion.VERSION_1_8 + } + tasks.withType().configureEach { useJUnitPlatform() From d9dc991a319d8c3271f3cce927bfcc0994d880f9 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Fri, 13 Aug 2021 15:09:03 -0700 Subject: [PATCH 3/5] should fix out of range --- .../main/java/us/ajg0702/queue/common/QueueManagerImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java b/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java index 2bfcc41..5af0907 100644 --- a/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java +++ b/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java @@ -471,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(); } From 4510b961e14d81f64de72d78f68a42e8cc236435 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Fri, 13 Aug 2021 16:39:01 -0700 Subject: [PATCH 4/5] update ajUtils (to fix config resetting on update) --- api/build.gradle.kts | 2 +- common/build.gradle.kts | 2 +- free/build.gradle.kts | 2 +- platforms/bungeecord/build.gradle.kts | 2 +- platforms/velocity/build.gradle.kts | 2 +- premium/build.gradle.kts | 2 +- spigot/build.gradle.kts | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/build.gradle.kts b/api/build.gradle.kts index bc5cc11..6f6db74 100644 --- a/api/build.gradle.kts +++ b/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 { diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 84d0606..9661044 100644 --- a/common/build.gradle.kts +++ b/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") diff --git a/free/build.gradle.kts b/free/build.gradle.kts index 023ba38..d75bcbd 100644 --- a/free/build.gradle.kts +++ b/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")) diff --git a/platforms/bungeecord/build.gradle.kts b/platforms/bungeecord/build.gradle.kts index e710573..96b77ac 100644 --- a/platforms/bungeecord/build.gradle.kts +++ b/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") diff --git a/platforms/velocity/build.gradle.kts b/platforms/velocity/build.gradle.kts index 7feb6c7..bd142b7 100644 --- a/platforms/velocity/build.gradle.kts +++ b/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") diff --git a/premium/build.gradle.kts b/premium/build.gradle.kts index dd1d016..35a51ec 100644 --- a/premium/build.gradle.kts +++ b/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") diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts index b6944be..a24dff6 100644 --- a/spigot/build.gradle.kts +++ b/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") From 11b556c7cf1c724b941ae11f51d5c9182d0b042f Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Fri, 13 Aug 2021 17:50:41 -0700 Subject: [PATCH 5/5] 2.0.3 --- build.gradle.kts | 2 +- common/src/main/resources/config.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 89d84aa..2f9ba5d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ repositories { } allprojects { - version = "2.0.2" + version = "2.0.3" group = "us.ajg0702" plugins.apply("java") diff --git a/common/src/main/resources/config.yml b/common/src/main/resources/config.yml index 2cedc4e..736c47b 100644 --- a/common/src/main/resources/config.yml +++ b/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