From 9536b98b7dacbc0a4e3fae8c75f9ad09ec8a4d19 Mon Sep 17 00:00:00 2001
From: Adrian <adriangonzalesval@gmail.com>
Date: Sat, 29 Jul 2023 10:55:27 -0500
Subject: [PATCH] fix: Fixed AutoLogin inconsistency

---
 .../paper/listeners/AuthMeListener.java               |  2 +-
 .../paper/listeners/MessageListener.java              | 11 ++++++++---
 .../listener/connection/PostConnectListener.java      |  1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/listeners/AuthMeListener.java b/paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/listeners/AuthMeListener.java
index 2c01d53..acb9436 100644
--- a/paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/listeners/AuthMeListener.java
+++ b/paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/listeners/AuthMeListener.java
@@ -49,7 +49,7 @@ public final class AuthMeListener implements Listener {
 
         if (!preSendLoginEvent.isCancelled()) {
             plugin.sendMessageToProxy(player, MessageType.LOGIN, player.getName());
-            plugin.getLogger().info("LoginEvent | PreSendLoginEvent allowed");
+            plugin.logDebug("LoginEvent | PreSendLoginEvent allowed");
         }
     }
 
diff --git a/paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/listeners/MessageListener.java b/paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/listeners/MessageListener.java
index 6ee4549..136eda9 100644
--- a/paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/listeners/MessageListener.java
+++ b/paper/src/main/java/io/github/_4drian3d/authmevelocity/paper/listeners/MessageListener.java
@@ -38,7 +38,7 @@ public final class MessageListener implements PluginMessageListener {
     @Override
     public void onPluginMessageReceived(
             final @NotNull String identifier,
-            final @NotNull Player player,
+            final @NotNull Player $,
             final byte @NotNull [] bytes
     ) {
         if (identifier.equals("authmevelocity:main")) {
@@ -46,13 +46,18 @@ public final class MessageListener implements PluginMessageListener {
             final ByteArrayDataInput input = ByteStreams.newDataInput(bytes);
 
             final String data = input.readUTF();
-            processData(player, data);
+            final String username = input.readUTF();
+            processData(username, data);
             plugin.logDebug("PluginMessage | AuthMeVelocity identifier processed");
         }
     }
 
-    private void processData(Player player, String data) {
+    private void processData(String name, String data) {
         if (MessageType.LOGIN.toString().equals(data)) {
+            final Player player = this.plugin.getServer().getPlayer(name);
+            if (player == null) {
+                return;
+            }
             plugin.logDebug("PluginMessage | Login Message");
             Bukkit.getPluginManager().callEvent(new LoginByProxyEvent(player));
             AuthMeApi.getInstance().forceLogin(player);
diff --git a/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/connection/PostConnectListener.java b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/connection/PostConnectListener.java
index 8730b3d..13ccf26 100644
--- a/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/connection/PostConnectListener.java
+++ b/velocity/src/main/java/io/github/_4drian3d/authmevelocity/velocity/listener/connection/PostConnectListener.java
@@ -62,6 +62,7 @@ public final class PostConnectListener implements Listener<ServerPostConnectEven
             plugin.logDebug("ServerPostConnectEvent | Already logged player and connected to an Auth server");
             final ByteArrayDataOutput buf = ByteStreams.newDataOutput();
             buf.writeUTF("LOGIN");
+            buf.writeUTF(player.getUsername());
 
             final byte[] byteArray = buf.toByteArray();
             plugin.logDebug("ServerPostConnectEvent | Sending LOGIN data");