Improved handling of different hostnames with the same IP

Author: Kamesuta

src/main/java/com/kamesuta/bungeeviaproxy/BungeeViaProxy.java

@@ -1,5 +1,6 @@
 package com.kamesuta.bungeeviaproxy;
 
+import net.md_5.bungee.BungeeServerInfo;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.PendingConnection;
@@ -28,19 +29,18 @@ public void onEnable() {
         // In Bungeecord, even if the hostnames are different, the equals method returns true if the resolved IP addresses are the same.
         // This results in the error "You are already connected to this server!".
         // To avoid this, we use unresolved InetSocketAddress objects so that different hostnames are treated as distinct servers.
-        ProxyServer.getInstance().getServers().values().forEach(serverInfo -> {
-            // Convert address to unresolved address
-            SocketAddress socketAddress = serverInfo.getSocketAddress();
-            if (socketAddress instanceof InetSocketAddress) {
-                InetSocketAddress inetSocketAddress = (InetSocketAddress) socketAddress;
-                // Only convert if the address is a ViaProxy address
-                if (inetSocketAddress.getHostString().contains(IDENTIFIER) && ReflectionUtil.isBungeeSeverInfo(serverInfo)) {
-                    ReflectionUtil.setBungeeServerInfoSocketAddress(
-                            serverInfo,
-                            InetSocketAddress.createUnresolved(inetSocketAddress.getHostString(), inetSocketAddress.getPort())
-                    );
-                }
-            }
+        ProxyServer.getInstance().getServers().replaceAll((name, serverInfo) -> {
+            // if the serverInfo is already a HostnameBungeeServerInfo, return it as is
+            if (serverInfo instanceof HostnameBungeeServerInfo) return serverInfo;
+            // if the serverInfo is not a BungeeServerInfo, return it as is
+            if (!(serverInfo instanceof BungeeServerInfo)) return serverInfo;
+            // wrap the BungeeServerInfo to HostnameBungeeServerInfo
+            return new HostnameBungeeServerInfo(
+                    serverInfo.getName(),
+                    serverInfo.getSocketAddress(),
+                    serverInfo.getMotd(),
+                    serverInfo.isRestricted()
+            );
         });
     }
 

src/main/java/com/kamesuta/bungeeviaproxy/HostnameBungeeServerInfo.java

@@ -0,0 +1,45 @@
+package com.kamesuta.bungeeviaproxy;
+
+import net.md_5.bungee.BungeeServerInfo;
+import net.md_5.bungee.api.config.ServerInfo;
+
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.util.Objects;
+
+public class HostnameBungeeServerInfo extends BungeeServerInfo {
+
+    public HostnameBungeeServerInfo(String name, SocketAddress socketAddress, String motd, boolean restricted) {
+        super(name, socketAddress, motd, restricted);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof ServerInfo)) return false;
+
+        InetSocketAddress address = this.getAddress();
+        @SuppressWarnings("deprecation")
+        InetSocketAddress objAddress = ((ServerInfo) obj).getAddress();
+
+        if (address == null && objAddress == null) return true;
+        if (address == null || objAddress == null) return false;
+
+        // BungeeServerInfo is treated as the same server if the resolved IP addresses are the same,
+        // so treat them as different servers if the hostnames are different.
+        return Objects.equals(address.getHostName(), objAddress.getHostName()) && address.getPort() == objAddress.getPort();
+    }
+
+    @Override
+    public int hashCode() {
+        InetSocketAddress address = this.getAddress();
+        if (address == null) return 0;
+
+        int result = 17;
+        result = 31 * result + address.getPort();
+        if (address.getHostName() != null) {
+            result = 31 * result + address.getHostName().hashCode();
+        }
+        return result;
+    }
+
+}