Merge branch 'development' into EngineAPI-Refactor

This commit is contained in:
Areloch 2018-12-09 14:48:50 -06:00 committed by GitHub
commit 3a71c75596
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1937 changed files with 102332 additions and 70549 deletions

View file

@ -1842,8 +1842,6 @@ void Net::addressToString(const NetAddress *address, char addressString[256])
{
char buffer[256];
buffer[0] = '\0';
sockaddr_in ipAddr;
NetAddressToIPSocket(address, &ipAddr);
inet_ntop(AF_INET, &(ipAddr.sin_addr), buffer, sizeof(buffer));
if (ipAddr.sin_port == 0)
dSprintf(addressString, 256, "IP:%s", buffer);