From fb1e8cd475ae5bacf73f9431eb70375430f88984 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Fri, 19 Aug 2022 17:23:56 -0700 Subject: [PATCH] Wont check joinfrom permission unless the player actually executed the command (/ajq send bypasses joinfrom now) --- .../ajg0702/queue/commands/commands/queue/QueueCommand.java | 4 ++++ .../main/java/us/ajg0702/queue/common/QueueManagerImpl.java | 5 ----- 2 files changed, 4 insertions(+), 5 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 baf1071..0677fb4 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 @@ -63,6 +63,10 @@ public class QueueCommand extends BaseCommand { sender.sendMessage(getMessages().getComponent("noperm")); return; } + if(main.getConfig().getBoolean("joinfrom-server-permission") && !player.hasPermission("ajqueue.joinfrom."+player.getServerName())) { + player.sendMessage(getMessages().getComponent("errors.deny-joining-from-server")); + return; + } main.getQueueManager().addToQueue(player, args[0]); } else { sender.sendMessage(getMessages().getComponent("commands.joinqueue.usage")); 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 d997c3e..2857c26 100644 --- a/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java +++ b/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java @@ -103,11 +103,6 @@ public class QueueManagerImpl implements QueueManager { Debug.info("addToQueue method called for "+player.getName()+" to "+server.getName()); - if(main.getConfig().getBoolean("joinfrom-server-permission") && !player.hasPermission("ajqueue.joinfrom."+player.getServerName())) { - player.sendMessage(msgs.getComponent("errors.deny-joining-from-server")); - return false; - } - int playerVersion = player.getProtocolVersion(); List supportedProtocols = server.getSupportedProtocols(); if(!supportedProtocols.contains(playerVersion) && supportedProtocols.size() > 0) {