From b9cf8f04985a19f2ea8d88d1fbf98094803f5b02 Mon Sep 17 00:00:00 2001
From: games647 <games647@users.noreply.github.com>
Date: Fri, 15 May 2020 14:05:00 +0200
Subject: [PATCH] Log setting the offline UUID on Bungee

Related #344
---
 .../fastlogin/bukkit/listener/ConnectionListener.java         | 4 +++-
 .../games647/fastlogin/bungee/listener/ConnectListener.java   | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

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 374d38c5..e31468d1 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
@@ -45,7 +45,9 @@ public class ConnectionListener implements Listener {
             // cases: Paper (firing BungeeCord message before PlayerJoinEvent) or not running BungeeCord and already
             // having the login session from the login process
             BukkitLoginSession session = plugin.getSession(player.getAddress());
-            if (session != null) {
+            if (session == null) {
+                plugin.getLog().info("No on-going login session for player: {}", player);
+            } else {
                 Runnable forceLoginTask = new ForceLoginTask(plugin.getCore(), player, session);
                 Bukkit.getScheduler().runTaskAsynchronously(plugin, forceLoginTask);
             }
diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java
index 12c7977e..3a46b692 100644
--- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java
+++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/ConnectListener.java
@@ -82,6 +82,7 @@ public class ConnectListener implements Listener {
             //bungeecord will do this automatically so override it on disabled option
             if (!plugin.getCore().getConfig().get("premiumUuid", true)) {
                 try {
+                    UUID oldPremiumId = connection.getUniqueId();
                     UUID offlineUUID = UUIDAdapter.generateOfflineId(username);
 
                     // BungeeCord only allows setting the UUID in PreLogin events and before requesting online mode
@@ -90,6 +91,8 @@ public class ConnectListener implements Listener {
                     Field idField = InitialHandler.class.getDeclaredField("uniqueId");
                     idField.setAccessible(true);
                     idField.set(connection, offlineUUID);
+
+                    plugin.getLog().info("Overriding UUID to {} from {} on {}", offlineUUID, oldPremiumId, connection);
                 } catch (NoSuchFieldException | IllegalAccessException ex) {
                     plugin.getLog().error("Failed to set offline uuid of {}", username, ex);
                 }