From ee8a1a86c1350653bfb7edc34fca423cd1837af0 Mon Sep 17 00:00:00 2001 From: Ted John Date: Thu, 30 Apr 2020 02:18:32 +0100 Subject: [PATCH] Add comments and null check --- src/openrct2/network/Network.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index 71d5bb836d..6a005b94bd 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -1676,6 +1676,7 @@ void Network::Server_Send_CHAT(const char* text, const std::vector& pla if (playerIds.empty()) { + // Empty players / default value means send to all players SendPacketToClients(*packet); } else @@ -3522,7 +3523,7 @@ money32 network_get_player_money_spent(uint32_t index) std::string network_get_player_ip_address(uint32_t id) { auto conn = gNetwork.GetPlayerConnection(id); - if (conn != nullptr) + if (conn != nullptr && conn->Socket != nullptr) { return conn->Socket->GetIpAddress(); } @@ -4002,6 +4003,7 @@ void network_send_chat(const char* text, const std::vector& playerIds) if (playerIds.empty() || std::find(playerIds.begin(), playerIds.end(), gNetwork.GetPlayerID()) != playerIds.end()) { + // Server is one of the recipients chat_history_add(formatted); } gNetwork.Server_Send_CHAT(formatted, playerIds);