Some debug

This commit is contained in:
ajgeiss0702
2021-10-23 11:50:06 -07:00
parent a5d0205777
commit 0c84632cc0
3 changed files with 16 additions and 1 deletions
@@ -10,6 +10,7 @@ import us.ajg0702.queue.api.queues.QueueServer;
import us.ajg0702.queue.api.server.AdaptedServer; import us.ajg0702.queue.api.server.AdaptedServer;
import us.ajg0702.queue.common.players.QueuePlayerImpl; import us.ajg0702.queue.common.players.QueuePlayerImpl;
import us.ajg0702.queue.common.queues.QueueServerImpl; 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.Messages;
import us.ajg0702.utils.common.TimeUtils; import us.ajg0702.utils.common.TimeUtils;
@@ -86,9 +87,15 @@ public class QueueManagerImpl implements QueueManager {
@Override @Override
public boolean addToQueue(AdaptedPlayer player, QueueServer server) { public boolean addToQueue(AdaptedPlayer player, QueueServer server) {
if(player == null || server == null) { if(player == null || server == null) {
Debugger.debug("addToQueue method called, but something is null");
return false; 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())) { if(main.getConfig().getBoolean("joinfrom-server-permission") && !player.hasPermission("ajqueue.joinfrom."+player.getServerName())) {
player.sendMessage(msgs.getComponent("errors.deny-joining-from-server")); player.sendMessage(msgs.getComponent("errors.deny-joining-from-server"));
@@ -516,6 +523,7 @@ public class QueueManagerImpl implements QueueManager {
} }
for(QueueServer server : sendingServers) { for(QueueServer server : sendingServers) {
Debugger.debug("Sending players for "+server.getName());
for(QueuePlayer queuePlayer : server.getQueue()) { for(QueuePlayer queuePlayer : server.getQueue()) {
if(queuePlayer.getPlayer() != null) continue; if(queuePlayer.getPlayer() != null) continue;
if(main.getLogic().playerDisconnectedTooLong(queuePlayer)) { if(main.getLogic().playerDisconnectedTooLong(queuePlayer)) {
@@ -609,6 +617,9 @@ public class QueueManagerImpl implements QueueManager {
server.setLastSentTime(System.currentTimeMillis()); server.setLastSentTime(System.currentTimeMillis());
nextPlayer.connect(selected); nextPlayer.connect(selected);
server.addPlayer(selected); server.addPlayer(selected);
if(main.getConfig().getBoolean("debug")) {
Debugger.debug(selected.getName()+" player count is now set to "+ server.getLastPings().get(selected).getPlayerCount());
}
} }
} }
@@ -12,6 +12,7 @@ import net.md_5.bungee.api.connection.ProxiedPlayer;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import us.ajg0702.queue.api.players.AdaptedPlayer; import us.ajg0702.queue.api.players.AdaptedPlayer;
import us.ajg0702.queue.api.server.AdaptedServer; 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.BungeeQueue;
import us.ajg0702.queue.platforms.bungeecord.server.BungeeServer; import us.ajg0702.queue.platforms.bungeecord.server.BungeeServer;
@@ -121,6 +122,7 @@ public class BungeePlayer implements AdaptedPlayer, Audience {
@Override @Override
public void connect(AdaptedServer server) { public void connect(AdaptedServer server) {
Debugger.debug("Attempting to send "+getName()+" to "+server.getName());
handle.connect(((BungeeServer) server).getHandle()); handle.connect(((BungeeServer) server).getHandle());
} }
@@ -14,6 +14,7 @@ import org.jetbrains.annotations.NotNull;
import us.ajg0702.queue.api.players.AdaptedPlayer; import us.ajg0702.queue.api.players.AdaptedPlayer;
import us.ajg0702.queue.api.server.AdaptedServer; import us.ajg0702.queue.api.server.AdaptedServer;
import us.ajg0702.queue.common.QueueMain; import us.ajg0702.queue.common.QueueMain;
import us.ajg0702.queue.common.utils.Debugger;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
@@ -117,6 +118,7 @@ public class VelocityPlayer implements AdaptedPlayer, Audience {
@Override @Override
public void connect(AdaptedServer server) { public void connect(AdaptedServer server) {
Debugger.debug("Attempting to send "+getName()+" to "+server.getName());
handle.createConnectionRequest((RegisteredServer) server.getHandle()).connect().thenAcceptAsync( handle.createConnectionRequest((RegisteredServer) server.getHandle()).connect().thenAcceptAsync(
result -> { result -> {
if(!result.isSuccessful()) { if(!result.isSuccessful()) {