Merge branch 'dev' into 'master'

1.9.5

See merge request ajg0702/ajqueue!9

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "us.ajg0702"
-version = "1.9.4"
+version = "1.9.5"
 
 repositories {
     mavenCentral()
@@ -43,7 +43,7 @@ tasks.withType<ProcessResources> {
 tasks.shadowJar {
     relocate("us.ajg0702.utils", "us.ajg0702.queue.utils")
     relocate("org.bstats", "us.ajg0702.bstats")
-    archiveFileName.set("${archiveBaseName}-${archiveVersion}.${archiveExtension}")
+    archiveFileName.set("${baseName}-${version}.${extension}")
 }
 
 publishing {

settings.gradle.kts

@@ -0,0 +1 @@
+rootProject.name = "ajQueue"

src/main/java/us/ajg0702/queue/Manager.java

@@ -332,9 +332,10 @@ public class Manager {
 	
 	
 	public void sendQueueEvents() {
-		for(QueueServer s : servers) {
-			for(ProxiedPlayer p : s.getQueue()) {
-				BungeeUtils.sendCustomData(p, "inqueueevent", "true");
+		for(Iterator<QueueServer> it = servers.iterator(); it.hasNext();) {
+			QueueServer s = it.next();
+			for(Iterator<ProxiedPlayer> pit = s.getQueue().iterator(); pit.hasNext();) {
+				BungeeUtils.sendCustomData(pit.next(), "inqueueevent", "true");
 			}
 		}
 	}
@@ -558,15 +559,14 @@ public class Manager {
 			if(s.getName() == null) {
 				pl.getLogger().info("s.getName() is null");
 			}*/
-			
-			
-			while(nextplayer.getServer().getInfo().getName().equals(s.getName())) {
+
+			if(s.getQueue().size() <= 0) continue;
+			while(!nextplayer.isConnected()) {
 				s.getQueue().remove(nextplayer);
 				if(s.getQueue().size() <= 0) break;
 				nextplayer = s.getQueue().get(0);
 			}
-			if(s.getQueue().size() <= 0) continue;
-			while(!nextplayer.isConnected()) {
+			while(nextplayer.getServer().getInfo().getName().equals(s.getName())) {
 				s.getQueue().remove(nextplayer);
 				if(s.getQueue().size() <= 0) break;
 				nextplayer = s.getQueue().get(0);