From 750ff8f3ce719786a1590dd3cd10fb13b36d4261 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 7 Jul 2020 02:00:42 +0200 Subject: [PATCH] Core/Battle.net: Only send one IP address for a realm - fixes waiting time to join realm if the wrong address gets picked by the client first (local address for external client) --- src/server/bnetserver/Server/Session.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/server/bnetserver/Server/Session.cpp b/src/server/bnetserver/Server/Session.cpp index d2a8dae7e26..e1abc75522b 100644 --- a/src/server/bnetserver/Server/Session.cpp +++ b/src/server/bnetserver/Server/Session.cpp @@ -506,9 +506,7 @@ void Battlenet::Session::HandleJoinRequestV2(WoWRealm::JoinRequestV2 const& join stmt->setString(4, _gameAccountInfo->Name); LoginDatabase.DirectExecute(stmt); - joinResponse->IPv4.emplace_back(*realm->ExternalAddress, realm->Port); - if (*realm->ExternalAddress != *realm->LocalAddress) - joinResponse->IPv4.emplace_back(*realm->LocalAddress, realm->Port); + joinResponse->IPv4.push_back(realm->GetAddressForClient(GetRemoteIpAddress())); AsyncWrite(joinResponse); }