From 7c125dc0b6d2a6904977d93e35b2673b7cef97ce Mon Sep 17 00:00:00 2001
From: games647 <games647@users.noreply.github.com>
Date: Thu, 21 May 2020 10:03:56 +0200
Subject: [PATCH] Add more debugging messages for delayed proxy logins

Related #352
---
 .../games647/fastlogin/bukkit/FastLoginBukkit.java     | 10 +++++++---
 .../fastlogin/bukkit/listener/BungeeListener.java      |  5 ++++-
 .../fastlogin/bukkit/listener/ConnectionListener.java  |  3 ++-
 .../fastlogin/core/shared/ForceLoginManagement.java    |  8 +++++++-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
index 966f3fa0..e1501e82 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
@@ -123,17 +123,21 @@ public class FastLoginBukkit extends JavaPlugin implements PlatformPlugin<Comman
     }
 
     public BukkitLoginSession getSession(InetSocketAddress addr) {
-        String id = addr.getAddress().getHostAddress() + ':' + addr.getPort();
+        String id = getSessionId(addr);
         return loginSession.get(id);
     }
 
+    public String getSessionId(InetSocketAddress addr) {
+        return addr.getAddress().getHostAddress() + ':' + addr.getPort();
+    }
+
     public void putSession(InetSocketAddress addr, BukkitLoginSession session) {
-        String id = addr.getAddress().getHostAddress() + ':' + addr.getPort();
+        String id = getSessionId(addr);
         loginSession.put(id, session);
     }
 
     public void removeSession(InetSocketAddress addr) {
-        String id = addr.getAddress().getHostAddress() + ':' + addr.getPort();
+        String id = getSessionId(addr);
         loginSession.remove(id);
     }
 
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeListener.java
index b9cb478b..2af388cf 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeListener.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeListener.java
@@ -68,6 +68,7 @@ public class BungeeListener implements PluginMessageListener {
         Type type = message.getType();
 
         InetSocketAddress address = player.getAddress();
+        plugin.getLog().info("Player info {} command for {} from proxy", type, playerName);
         if (type == Type.LOGIN) {
             onLoginMessage(player, playerName, address);
         } else if (type == Type.REGISTER) {
@@ -103,7 +104,9 @@ public class BungeeListener implements PluginMessageListener {
         plugin.putSession(player.getAddress(), session);
 
         // only start a new login task if the join event fired earlier. This event then didn
-        if (plugin.getBungeeManager().didJoinEventFired(player)) {
+        boolean result = plugin.getBungeeManager().didJoinEventFired(player);
+        plugin.getLog().info("Delaying force login until join event fired?: {}", result);
+        if (result) {
             Runnable forceLoginTask = new ForceLoginTask(plugin.getCore(), player, session);
             Bukkit.getScheduler().runTaskAsynchronously(plugin, forceLoginTask);
         }
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ConnectionListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ConnectionListener.java
index e31468d1..e2b3d0ab 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ConnectionListener.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ConnectionListener.java
@@ -46,7 +46,8 @@ public class ConnectionListener implements Listener {
             // having the login session from the login process
             BukkitLoginSession session = plugin.getSession(player.getAddress());
             if (session == null) {
-                plugin.getLog().info("No on-going login session for player: {}", player);
+                String sessionId = plugin.getSessionId(player.getAddress());
+                plugin.getLog().info("No on-going login session for player: {} with ID {}", player, sessionId);
             } else {
                 Runnable forceLoginTask = new ForceLoginTask(plugin.getCore(), player, session);
                 Bukkit.getScheduler().runTaskAsynchronously(plugin, forceLoginTask);
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/shared/ForceLoginManagement.java b/core/src/main/java/com/github/games647/fastlogin/core/shared/ForceLoginManagement.java
index b485896a..64ad1daa 100644
--- a/core/src/main/java/com/github/games647/fastlogin/core/shared/ForceLoginManagement.java
+++ b/core/src/main/java/com/github/games647/fastlogin/core/shared/ForceLoginManagement.java
@@ -20,7 +20,13 @@ public abstract class ForceLoginManagement<P extends C, C, L extends LoginSessio
 
     @Override
     public void run() {
-        if (!isOnline(player) || session == null) {
+        if (!isOnline(player)) {
+            core.getPlugin().getLog().info("Player {} disconnected", player);
+            return;
+        }
+
+        if (session == null) {
+            core.getPlugin().getLog().info("No valid session found for {}", player);
             return;
         }