From 9e3128747609a8cd126c324338352039eba3e9cf Mon Sep 17 00:00:00 2001
From: Adrian Bergqvist <adde0109@gmail.com>
Date: Sun, 26 Mar 2023 21:45:17 +0200
Subject: [PATCH] Fixed #20

---
 .../ambassador/forge/VelocityForgeClientConnectionPhase.java    | 1 +
 .../ambassador/velocity/backend/ForgeLoginSessionHandler.java   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/main/java/org/adde0109/ambassador/forge/VelocityForgeClientConnectionPhase.java b/src/main/java/org/adde0109/ambassador/forge/VelocityForgeClientConnectionPhase.java
index 94066c6..733d917 100644
--- a/src/main/java/org/adde0109/ambassador/forge/VelocityForgeClientConnectionPhase.java
+++ b/src/main/java/org/adde0109/ambassador/forge/VelocityForgeClientConnectionPhase.java
@@ -93,6 +93,7 @@ public enum VelocityForgeClientConnectionPhase implements ClientConnectionPhase
             ((OutboundSuccessHolder) connection.getChannel().pipeline().get(ForgeConstants.SERVER_SUCCESS_LISTENER))
                     .sendPacket();
             connection.setState(StateRegistry.PLAY);
+            ((VelocityServer) Ambassador.getInstance().server).registerConnection(player);
           }
         }
         return true;
diff --git a/src/main/java/org/adde0109/ambassador/velocity/backend/ForgeLoginSessionHandler.java b/src/main/java/org/adde0109/ambassador/velocity/backend/ForgeLoginSessionHandler.java
index 50acd49..5d86d61 100644
--- a/src/main/java/org/adde0109/ambassador/velocity/backend/ForgeLoginSessionHandler.java
+++ b/src/main/java/org/adde0109/ambassador/velocity/backend/ForgeLoginSessionHandler.java
@@ -11,6 +11,7 @@ import com.velocitypowered.proxy.protocol.packet.Disconnect;
 import com.velocitypowered.proxy.protocol.packet.LoginPluginMessage;
 import com.velocitypowered.proxy.protocol.packet.ServerLoginSuccess;
 import net.kyori.adventure.text.Component;
+import org.adde0109.ambassador.Ambassador;
 import org.adde0109.ambassador.forge.ForgeConstants;
 import org.adde0109.ambassador.forge.ForgeFMLConnectionType;
 import org.adde0109.ambassador.forge.VelocityForgeBackendConnectionPhase;
@@ -55,6 +56,7 @@ public class ForgeLoginSessionHandler implements MinecraftSessionHandler {
       ((OutboundSuccessHolder) connection.getChannel().pipeline().get(ForgeConstants.SERVER_SUCCESS_LISTENER))
               .sendPacket();
       connection.setState(StateRegistry.PLAY);
+      ((VelocityServer) Ambassador.getInstance().server).registerConnection(player);
     }
 
     original.handle(packet);