From 493fe3e3c2efce0efbe368395f4fb9fa3506a801 Mon Sep 17 00:00:00 2001
From: Andrew Steinborn <git@steinborn.me>
Date: Mon, 12 Jul 2021 09:28:05 -0400
Subject: [PATCH] Forward-port 61c0c0d083c7ba9214681d52e34bc427d3cd58c1

---
 .../proxy/connection/client/ConnectedPlayer.java               | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
index bb67f9b0d..92dbf475a 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
@@ -871,7 +871,8 @@ public class ConnectedPlayer implements MinecraftConnectionAssociation, Player {
           && !connectedServer.hasCompletedJoin())) {
         return ConnectionRequestBuilder.Status.CONNECTION_IN_PROGRESS;
       }
-      if (connectedServer != null && connectedServer.target().equals(server)) {
+      if (connectedServer != null && connectedServer.target().serverInfo()
+          .equals(server.serverInfo())) {
         return ALREADY_CONNECTED;
       }
       return null;