Add server-id hash to LoginEvent

Author: roccodev

api/src/main/java/com/velocitypowered/api/event/connection/LoginEvent.java

@@ -22,17 +22,34 @@
 public final class LoginEvent implements ResultedEvent<ResultedEvent.ComponentResult> {
 
   private final Player player;
+  private final String serverIdHash;
   private ComponentResult result;
 
-  public LoginEvent(Player player) {
+  /**
+   * Creates a new login event.
+   *
+   * @param player the player who logged in
+   * @param serverIdHash the server ID hash sent to Mojang for authentication,
+   *                     or {@code null} if the connection is in offline-mode
+   */
+  public LoginEvent(Player player, String serverIdHash) {
     this.player = Preconditions.checkNotNull(player, "player");
+    this.serverIdHash = serverIdHash;
     this.result = ComponentResult.allowed();
   }
 
   public Player getPlayer() {
     return player;
   }
 
+  /**
+   * Returns the server ID hash that was sent to Mojang to authenticate the player.
+   * If the connection was in offline-mode, this returns {@code null}.
+   */
+  public String getServerIdHash() {
+    return serverIdHash;
+  }
+
   @Override
   public ComponentResult getResult() {
     return result;

proxy/src/main/java/com/velocitypowered/proxy/connection/client/AuthSessionHandler.java

@@ -64,14 +64,16 @@ public class AuthSessionHandler implements MinecraftSessionHandler {
   private GameProfile profile;
   private @MonotonicNonNull ConnectedPlayer connectedPlayer;
   private final boolean onlineMode;
+  private final String serverIdHash;
 
   AuthSessionHandler(VelocityServer server, LoginInboundConnection inbound,
-      GameProfile profile, boolean onlineMode) {
+      GameProfile profile, boolean onlineMode, String serverIdHash) {
     this.server = Preconditions.checkNotNull(server, "server");
     this.inbound = Preconditions.checkNotNull(inbound, "inbound");
     this.profile = Preconditions.checkNotNull(profile, "profile");
     this.onlineMode = onlineMode;
     this.mcConnection = inbound.delegatedConnection();
+    this.serverIdHash = serverIdHash;
   }
 
   @Override
@@ -174,7 +176,7 @@ private void completeLoginProtocolPhaseAndInitialize(ConnectedPlayer player) {
     mcConnection.setAssociation(player);
     mcConnection.setState(StateRegistry.PLAY);
 
-    server.getEventManager().fire(new LoginEvent(player))
+    server.getEventManager().fire(new LoginEvent(player, serverIdHash))
         .thenAcceptAsync(event -> {
           if (mcConnection.isClosed()) {
             // The player was disconnected

proxy/src/main/java/com/velocitypowered/proxy/connection/client/InitialLoginSessionHandler.java

@@ -151,7 +151,7 @@ public boolean handle(ServerLogin packet) {
                 this.currentState = LoginState.ENCRYPTION_REQUEST_SENT;
               } else {
                 mcConnection.setSessionHandler(new AuthSessionHandler(
-                    server, inbound, GameProfile.forOfflinePlayer(login.getUsername()), false
+                    server, inbound, GameProfile.forOfflinePlayer(login.getUsername()), false, null
                 ));
               }
             });
@@ -247,7 +247,7 @@ public boolean handle(EncryptionResponse packet) {
             }
             // All went well, initialize the session.
             mcConnection.setSessionHandler(new AuthSessionHandler(
-                server, inbound, profile, true
+                server, inbound, profile, true, serverId
             ));
           } else if (profileResponse.getStatusCode() == 204) {
             // Apparently an offline-mode user logged onto this online-mode proxy.