From 26b4f7dc335c9db60b6ca5b63f67cb780df3d637 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Sun, 7 Aug 2022 08:33:48 -0700 Subject: [PATCH] minor improvements to the spigot-side --- .../main/java/us/ajg0702/queue/spigot/Commands.java | 4 ++-- .../java/us/ajg0702/queue/spigot/SpigotMain.java | 13 +++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/spigot/src/main/java/us/ajg0702/queue/spigot/Commands.java b/spigot/src/main/java/us/ajg0702/queue/spigot/Commands.java index f39b8cd..acaa951 100644 --- a/spigot/src/main/java/us/ajg0702/queue/spigot/Commands.java +++ b/spigot/src/main/java/us/ajg0702/queue/spigot/Commands.java @@ -17,7 +17,7 @@ public class Commands implements CommandExecutor { @Override public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) { - if(!pl.hasProxy() && pl.config.getBoolean("check-proxy-response")) { + if(!pl.hasProxy() && pl.getAConfig().getBoolean("check-proxy-response")) { sender.sendMessage(color("&cajQueue must also be installed on the proxy!&7 If it has been installed on the proxy, make sure it loaded correctly and try relogging.")); return true; } @@ -53,7 +53,7 @@ public class Commands implements CommandExecutor { player = tply; srvname = args[1]; } - if(pl.config.getBoolean("send-queue-commands-in-batches")) { + if(pl.getAConfig().getBoolean("send-queue-commands-in-batches")) { pl.queuebatch.put(player, srvname); } else { assert player != null; diff --git a/spigot/src/main/java/us/ajg0702/queue/spigot/SpigotMain.java b/spigot/src/main/java/us/ajg0702/queue/spigot/SpigotMain.java index 66baa35..443bf70 100644 --- a/spigot/src/main/java/us/ajg0702/queue/spigot/SpigotMain.java +++ b/spigot/src/main/java/us/ajg0702/queue/spigot/SpigotMain.java @@ -23,12 +23,12 @@ import java.util.HashMap; @SuppressWarnings("UnstableApiUsage") public class SpigotMain extends JavaPlugin implements PluginMessageListener,Listener { - boolean papi = false; - Placeholders placeholders; + private boolean papi = false; + private Placeholders placeholders; - ConfigFile config; + private ConfigFile config; - boolean hasProxy = false; + private boolean hasProxy = false; @SuppressWarnings("ConstantConditions") public void onEnable() { @@ -242,4 +242,9 @@ public class SpigotMain extends JavaPlugin implements PluginMessageListener,List } e.setMotd("ajQueue;whitelisted="+whitelist); } + + + public ConfigFile getAConfig() { + return config; + } }