From cca8c2740f8e9df6a4d59e0822703a866d27785e Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Tue, 4 Jan 2022 10:38:56 -0700 Subject: [PATCH] fix kick-kicked-players looking for queueserver name instead of server name --- .../java/us/ajg0702/queue/common/EventHandlerImpl.java | 10 +++++++--- .../java/us/ajg0702/queue/common/QueueManagerImpl.java | 10 +++++----- .../ajg0702/queue/common/queues/QueueServerImpl.java | 10 ++++------ .../queue/common/utils/{Debugger.java => Debug.java} | 4 ++-- .../platforms/bungeecord/players/BungeePlayer.java | 4 ++-- .../platforms/velocity/players/VelocityPlayer.java | 4 ++-- 6 files changed, 22 insertions(+), 20 deletions(-) rename common/src/main/java/us/ajg0702/queue/common/utils/{Debugger.java => Debug.java} (77%) 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 7787dc8..3d9dddf 100644 --- a/common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java +++ b/common/src/main/java/us/ajg0702/queue/common/EventHandlerImpl.java @@ -12,7 +12,7 @@ import us.ajg0702.queue.api.queues.QueueServer; import us.ajg0702.queue.api.server.AdaptedServer; import us.ajg0702.queue.commands.commands.PlayerSender; import us.ajg0702.queue.common.players.QueuePlayerImpl; -import us.ajg0702.queue.common.utils.Debugger; +import us.ajg0702.queue.common.utils.Debug; import java.io.ByteArrayInputStream; import java.io.DataInputStream; @@ -181,7 +181,7 @@ public class EventHandlerImpl implements EventHandler { String plainReason = PlainTextComponentSerializer.plainText().serialize(reason); - Debugger.debug(player.getName()+" kicked! Moving: "+moving+" from: "+from.getName()+" plainReason: "+plainReason ); + Debug.info(player.getName()+" kicked! Moving: "+moving+" from: "+from.getName()+" plainReason: "+plainReason ); if(!moving && main.getConfig().getBoolean("send-fail-debug")) { main.getLogger().warning("Failed to send "+player.getName()+" to "+from.getName()+". Kicked with reason: "+plainReason); @@ -219,6 +219,7 @@ public class EventHandlerImpl implements EventHandler { List kickReasons = main.getConfig().getStringList("kick-reasons"); boolean kickPlayer = main.getConfig().getBoolean("kick-kicked-players"); if(kickPlayer) { + Debug.info("Initially kicking player"); List svs = main.getConfig().getStringList("queue-servers"); boolean found = false; for(String s : svs) { @@ -226,12 +227,15 @@ public class EventHandlerImpl implements EventHandler { String[] parts = s.split(":"); String fromName = parts[0]; QueueServer toServer = main.getQueueManager().findServer(parts[1]); - if(fromName.equalsIgnoreCase(server.getName()) && toServer != null && toServer.equals(server)) { + if(toServer == null) continue; + Debug.info("fromName equals: "+fromName.equalsIgnoreCase(player.getServerName())+" ("+fromName+" = "+player.getServerName()+") toServer equals: "+toServer.equals(server)); + if(fromName.equalsIgnoreCase(player.getServerName()) && toServer.equals(server)) { found = true; } } kickPlayer = found; } + Debug.info("Kick player: "+kickPlayer); for(String kickReason : kickReasons) { if(plainReason.toLowerCase().contains(kickReason.toLowerCase())) { 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 85afa69..e5f3191 100644 --- a/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java +++ b/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java @@ -11,7 +11,7 @@ import us.ajg0702.queue.api.queues.QueueServer; import us.ajg0702.queue.api.server.AdaptedServer; import us.ajg0702.queue.common.players.QueuePlayerImpl; import us.ajg0702.queue.common.queues.QueueServerImpl; -import us.ajg0702.queue.common.utils.Debugger; +import us.ajg0702.queue.common.utils.Debug; import us.ajg0702.utils.common.Messages; import us.ajg0702.utils.common.TimeUtils; @@ -91,15 +91,15 @@ public class QueueManagerImpl implements QueueManager { @Override public boolean addToQueue(AdaptedPlayer player, QueueServer server) { if(player == null || server == null) { - Debugger.debug("addToQueue method called, but something is null"); + Debug.info("addToQueue method called, but something is null"); return false; } if(!player.isConnected()) { - Debugger.debug("addToQueue method called, but player is not connected"); + Debug.info("addToQueue method called, but player is not connected"); return false; } - Debugger.debug("addToQueue method called for "+player.getName()+" to "+server.getName()); + 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")); @@ -628,7 +628,7 @@ public class QueueManagerImpl implements QueueManager { nextPlayer.connect(selected); server.addPlayer(selected); if(main.getConfig().getBoolean("debug")) { - Debugger.debug(selected.getName()+" player count is now set to "+ server.getLastPings().get(selected).getPlayerCount()); + Debug.info(selected.getName()+" player count is now set to "+ server.getLastPings().get(selected).getPlayerCount()); } } } diff --git a/common/src/main/java/us/ajg0702/queue/common/queues/QueueServerImpl.java b/common/src/main/java/us/ajg0702/queue/common/queues/QueueServerImpl.java index 7751f18..6be7637 100644 --- a/common/src/main/java/us/ajg0702/queue/common/queues/QueueServerImpl.java +++ b/common/src/main/java/us/ajg0702/queue/common/queues/QueueServerImpl.java @@ -11,14 +11,12 @@ import us.ajg0702.queue.common.QueueMain; import us.ajg0702.queue.common.players.QueuePlayerImpl; import us.ajg0702.queue.common.queues.balancers.DefaultBalancer; import us.ajg0702.queue.common.queues.balancers.MinigameBalancer; -import us.ajg0702.queue.common.utils.Debugger; +import us.ajg0702.queue.common.utils.Debug; import us.ajg0702.utils.common.Messages; import java.util.*; import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; public class QueueServerImpl implements QueueServer { @@ -50,13 +48,13 @@ public class QueueServerImpl implements QueueServer { balancerType = "default"; balancer = new DefaultBalancer(this, main); } - Debugger.debug("Using "+balancerType.toLowerCase(Locale.ROOT)+" balancer for "+name); + Debug.info("Using "+balancerType.toLowerCase(Locale.ROOT)+" balancer for "+name); break; } } if(balancer == null) { balancer = new DefaultBalancer(this, main); - Debugger.debug("Using default balancer for "+name); + Debug.info("Using default balancer for "+name); } for(QueuePlayer queuePlayer : previousPlayers) { @@ -427,7 +425,7 @@ public class QueueServerImpl implements QueueServer { @Override public AdaptedServer getIdealServer(AdaptedPlayer player) { - Debugger.debug(getBalancer().toString()); + Debug.info(getBalancer().toString()); return getBalancer().getIdealServer(player); } diff --git a/common/src/main/java/us/ajg0702/queue/common/utils/Debugger.java b/common/src/main/java/us/ajg0702/queue/common/utils/Debug.java similarity index 77% rename from common/src/main/java/us/ajg0702/queue/common/utils/Debugger.java rename to common/src/main/java/us/ajg0702/queue/common/utils/Debug.java index 46a78c8..8c77664 100644 --- a/common/src/main/java/us/ajg0702/queue/common/utils/Debugger.java +++ b/common/src/main/java/us/ajg0702/queue/common/utils/Debug.java @@ -2,8 +2,8 @@ package us.ajg0702.queue.common.utils; import us.ajg0702.queue.api.AjQueueAPI; -public class Debugger { - public static void debug(String message) { +public class Debug { + public static void info(String message) { AjQueueAPI api = AjQueueAPI.getInstance(); if(!api.getConfig().getBoolean("debug")) return; api.getLogger().info("[debug] "+message); diff --git a/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/players/BungeePlayer.java b/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/players/BungeePlayer.java index d4fb41d..b638f11 100644 --- a/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/players/BungeePlayer.java +++ b/platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/players/BungeePlayer.java @@ -13,7 +13,7 @@ import net.md_5.bungee.api.connection.ProxiedPlayer; import org.jetbrains.annotations.NotNull; import us.ajg0702.queue.api.players.AdaptedPlayer; import us.ajg0702.queue.api.server.AdaptedServer; -import us.ajg0702.queue.common.utils.Debugger; +import us.ajg0702.queue.common.utils.Debug; import us.ajg0702.queue.platforms.bungeecord.BungeeQueue; import us.ajg0702.queue.platforms.bungeecord.server.BungeeServer; @@ -123,7 +123,7 @@ public class BungeePlayer implements AdaptedPlayer, Audience { @Override public void connect(AdaptedServer server) { - Debugger.debug("Attempting to send "+getName()+" to "+server.getName()); + Debug.info("Attempting to send "+getName()+" to "+server.getName()); handle.connect(((BungeeServer) server).getHandle()); } diff --git a/platforms/velocity/src/main/java/us/ajg0702/queue/platforms/velocity/players/VelocityPlayer.java b/platforms/velocity/src/main/java/us/ajg0702/queue/platforms/velocity/players/VelocityPlayer.java index a742860..5b043c2 100644 --- a/platforms/velocity/src/main/java/us/ajg0702/queue/platforms/velocity/players/VelocityPlayer.java +++ b/platforms/velocity/src/main/java/us/ajg0702/queue/platforms/velocity/players/VelocityPlayer.java @@ -14,7 +14,7 @@ import org.jetbrains.annotations.NotNull; import us.ajg0702.queue.api.players.AdaptedPlayer; import us.ajg0702.queue.api.server.AdaptedServer; import us.ajg0702.queue.common.QueueMain; -import us.ajg0702.queue.common.utils.Debugger; +import us.ajg0702.queue.common.utils.Debug; import java.util.List; import java.util.Optional; @@ -118,7 +118,7 @@ public class VelocityPlayer implements AdaptedPlayer, Audience { @Override public void connect(AdaptedServer server) { - Debugger.debug("Attempting to send "+getName()+" to "+server.getName()); + Debug.info("Attempting to send "+getName()+" to "+server.getName()); handle.createConnectionRequest((RegisteredServer) server.getHandle()).connect().thenAcceptAsync( result -> { if(!result.isSuccessful()) {