From bb1808cc2834b7864d6f0f6f1715484f416a792b Mon Sep 17 00:00:00 2001 From: daniel-skopek Date: Sun, 5 Jul 2026 22:32:40 +0200 Subject: [PATCH 1/2] Fix cooldown applying to failed queue attempts --- .../queue/commands/commands/queue/QueueCommand.java | 7 ++++--- .../java/us/ajg0702/queue/common/EventHandlerImpl.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/us/ajg0702/queue/commands/commands/queue/QueueCommand.java b/common/src/main/java/us/ajg0702/queue/commands/commands/queue/QueueCommand.java index e16583c4..0aedbc03 100644 --- a/common/src/main/java/us/ajg0702/queue/commands/commands/queue/QueueCommand.java +++ b/common/src/main/java/us/ajg0702/queue/commands/commands/queue/QueueCommand.java @@ -67,8 +67,6 @@ public void execute(ICommandSender sender, String[] args) { sender.sendMessage(main.getMessages().getComponent("errors.too-fast-queue")); return; } - - cooldowns.put(player, System.currentTimeMillis()); } if(args.length > 0) { @@ -84,7 +82,10 @@ public void execute(ICommandSender sender, String[] args) { player.sendMessage(getMessages().getComponent("errors.deny-joining-from-server")); return; } - main.getQueueManager().addToQueue(player, args[0]); + boolean success = main.getQueueManager().addToQueue(player, args[0]); + if(success && cooldownTime > 0) { + cooldowns.put(player, System.currentTimeMillis()); + } } else { sender.sendMessage(getMessages().getComponent("commands.joinqueue.usage")); } diff --git a/common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java b/common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java index 3f33578a..4532473c 100644 --- a/common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java +++ b/common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java @@ -195,7 +195,7 @@ public void onServerKick(AdaptedPlayer player, @NotNull AdaptedServer from, Comp for(QueueServer server : queuedServers) { if(!(server.getServerNames().contains(from.getName()))) continue; QueuePlayer queuePlayer = server.findPlayer(player); - if(queuePlayer.getPosition() != 1) continue; + if(queuePlayer == null || queuePlayer.getPosition() != 1) continue; List kickReasons = main.getConfig().getStringList("kick-reasons"); boolean kickPlayer = main.getConfig().getBoolean("kick-kicked-players"); if(kickPlayer) { From 37969dec9f08723d4a9c7d9e0b5e8d54adc0a23b Mon Sep 17 00:00:00 2001 From: daniel-skopek Date: Sun, 5 Jul 2026 22:44:15 +0200 Subject: [PATCH 2/2] Fixed Bungeecord repository URL --- platforms/bungeecord/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/bungeecord/build.gradle.kts b/platforms/bungeecord/build.gradle.kts index 678a4c78..3e87a267 100644 --- a/platforms/bungeecord/build.gradle.kts +++ b/platforms/bungeecord/build.gradle.kts @@ -8,7 +8,7 @@ group = "us.ajg0702.queue.platforms.bungeecord" repositories { //mavenLocal() maven { url = uri("https://repo.ajg0702.us/releases/") } - maven { url = uri("https://nexus.velocitypowered.com/repository/maven-public/") } + maven { url = uri("https://repo.papermc.io/repository/maven-public/") } maven { url = uri("https://repo.viaversion.com/") } maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots") } mavenCentral()