From 0c84632cc07a58dc5c2fdc03d417828ceaadcca6 Mon Sep 17 00:00:00 2001 From: ajgeiss0702 Date: Sat, 23 Oct 2021 11:50:06 -0700 Subject: [PATCH] Some debug --- .../us/ajg0702/queue/common/QueueManagerImpl.java | 13 ++++++++++++- .../platforms/bungeecord/players/BungeePlayer.java | 2 ++ .../platforms/velocity/players/VelocityPlayer.java | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) 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 f834ce7..e892b37 100644 --- a/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java +++ b/common/src/main/java/us/ajg0702/queue/common/QueueManagerImpl.java @@ -10,6 +10,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.utils.common.Messages; import us.ajg0702.utils.common.TimeUtils; @@ -86,9 +87,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"); return false; } - if(!player.isConnected()) return false; + if(!player.isConnected()) { + Debugger.debug("addToQueue method called, but player is not connected"); + return false; + } + + Debugger.debug("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")); @@ -516,6 +523,7 @@ public class QueueManagerImpl implements QueueManager { } for(QueueServer server : sendingServers) { + Debugger.debug("Sending players for "+server.getName()); for(QueuePlayer queuePlayer : server.getQueue()) { if(queuePlayer.getPlayer() != null) continue; if(main.getLogic().playerDisconnectedTooLong(queuePlayer)) { @@ -609,6 +617,9 @@ public class QueueManagerImpl implements QueueManager { server.setLastSentTime(System.currentTimeMillis()); 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()); + } } } 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 8e69d93..16bec07 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 @@ -12,6 +12,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.platforms.bungeecord.BungeeQueue; import us.ajg0702.queue.platforms.bungeecord.server.BungeeServer; @@ -121,6 +122,7 @@ public class BungeePlayer implements AdaptedPlayer, Audience { @Override public void connect(AdaptedServer server) { + Debugger.debug("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 c48634e..cd1c478 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,6 +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 java.util.List; import java.util.Optional; @@ -117,6 +118,7 @@ public class VelocityPlayer implements AdaptedPlayer, Audience { @Override public void connect(AdaptedServer server) { + Debugger.debug("Attempting to send "+getName()+" to "+server.getName()); handle.createConnectionRequest((RegisteredServer) server.getHandle()).connect().thenAcceptAsync( result -> { if(!result.isSuccessful()) {