From 32bf5d3114379e07f294fadbf44db0e4a06fb3a3 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Fri, 28 May 2021 10:03:21 -0700 Subject: [PATCH 1/4] Fix npe on massqueue --- src/main/java/us/ajg0702/queue/spigot/Main.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/us/ajg0702/queue/spigot/Main.java b/src/main/java/us/ajg0702/queue/spigot/Main.java index 5fafcc5..cc2cb14 100644 --- a/src/main/java/us/ajg0702/queue/spigot/Main.java +++ b/src/main/java/us/ajg0702/queue/spigot/Main.java @@ -45,6 +45,7 @@ public class Main extends JavaPlugin implements PluginMessageListener,Listener { if(Bukkit.getOnlinePlayers().size() <= 0 || queuebatch.size() <= 0) return; String msg = ""; for(Player p : queuebatch.keySet()) { + if(p == null || !p.isOnline()) continue; msg += p.getName()+":"+queuebatch.get(p)+","; } if(msg.length() > 1) { From 8937f29ebf4eb1b1678ff3200b67fad35d0db255 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Sun, 30 May 2021 10:16:05 -0700 Subject: [PATCH 2/4] Possibly fix infinite adding player to a queue --- src/main/java/us/ajg0702/queue/Main.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/us/ajg0702/queue/Main.java b/src/main/java/us/ajg0702/queue/Main.java index 98c815b..efe701a 100644 --- a/src/main/java/us/ajg0702/queue/Main.java +++ b/src/main/java/us/ajg0702/queue/Main.java @@ -243,6 +243,7 @@ public class Main extends Plugin implements Listener { p.sendMessage(msgs.getBC("auto-queued", "SERVER:"+toName)); man.addToQueue(p, toName); }, (long) (config.getDouble("auto-add-to-queue-on-kick-delay")*1000), TimeUnit.MILLISECONDS); + return; } } From c7de0dccb92be43b0dbd42e2c42367f120653942 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Sun, 30 May 2021 10:31:32 -0700 Subject: [PATCH 3/4] Should fix concurrentmodification --- src/main/java/us/ajg0702/queue/Manager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/us/ajg0702/queue/Manager.java b/src/main/java/us/ajg0702/queue/Manager.java index ee80971..f1a544c 100644 --- a/src/main/java/us/ajg0702/queue/Manager.java +++ b/src/main/java/us/ajg0702/queue/Manager.java @@ -614,7 +614,7 @@ public class Manager { * @param p The player * @param s The name of the server */ - public void addToQueue(ProxiedPlayer p, String s) { + public synchronized void addToQueue(ProxiedPlayer p, String s) { if(p == null || s == null) return; QueueServer server = findServer(s); if(server == null) { From 744cc7137b43626d0699932c17ca2fdceb12bc62 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Sun, 30 May 2021 10:33:40 -0700 Subject: [PATCH 4/4] 1.9.6 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 39fabb6..0d8408c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } group = "us.ajg0702" -version = "1.9.5" +version = "1.9.6" repositories { mavenCentral()