cdanesi/ajQueue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'master'

Browse Source 
1.9.5

See merge request ajg0702/ajqueue!9
This commit is contained in:
ajgeiss0702
2021-05-28 14:54:59 +00:00
parent fc5538c4fc e1c3f2bccd
commit 868e7f5f60
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+2 -2
View File
@@ -5,7 +5,7 @@ plugins {
} }
group = "us.ajg0702" group = "us.ajg0702"
version = "1.9.4" version = "1.9.5"
repositories { repositories {
mavenCentral() mavenCentral()
@@ -43,7 +43,7 @@ tasks.withType<ProcessResources> {
tasks.shadowJar { tasks.shadowJar {
relocate("us.ajg0702.utils", "us.ajg0702.queue.utils") relocate("us.ajg0702.utils", "us.ajg0702.queue.utils")
relocate("org.bstats", "us.ajg0702.bstats") relocate("org.bstats", "us.ajg0702.bstats")
archiveFileName.set("${archiveBaseName}-${archiveVersion}.${archiveExtension}") archiveFileName.set("${baseName}-${version}.${extension}")
} }
publishing { publishing {
settings.gradle.kts
+1
View File
@@ -0,0 +1 @@
rootProject.name = "ajQueue"
src/main/java/us/ajg0702/queue/Manager.java
+7 -7
View File
@@ -332,9 +332,10 @@ public class Manager {
public void sendQueueEvents() { public void sendQueueEvents() {
for(QueueServer s : servers) { for(Iterator<QueueServer> it = servers.iterator(); it.hasNext();) {
for(ProxiedPlayer p : s.getQueue()) { QueueServer s = it.next();
BungeeUtils.sendCustomData(p, "inqueueevent", "true"); for(Iterator<ProxiedPlayer> pit = s.getQueue().iterator(); pit.hasNext();) {
BungeeUtils.sendCustomData(pit.next(), "inqueueevent", "true");
} }
} }
} }
@@ -559,14 +560,13 @@ public class Manager {
pl.getLogger().info("s.getName() is null"); pl.getLogger().info("s.getName() is null");
}*/ }*/
if(s.getQueue().size() <= 0) continue;
while(nextplayer.getServer().getInfo().getName().equals(s.getName())) { while(!nextplayer.isConnected()) {
s.getQueue().remove(nextplayer); s.getQueue().remove(nextplayer);
if(s.getQueue().size() <= 0) break; if(s.getQueue().size() <= 0) break;
nextplayer = s.getQueue().get(0); nextplayer = s.getQueue().get(0);
} }
if(s.getQueue().size() <= 0) continue; while(nextplayer.getServer().getInfo().getName().equals(s.getName())) {
while(!nextplayer.isConnected()) {
s.getQueue().remove(nextplayer); s.getQueue().remove(nextplayer);
if(s.getQueue().size() <= 0) break; if(s.getQueue().size() <= 0) break;
nextplayer = s.getQueue().get(0); nextplayer = s.getQueue().get(0);