Do not send packets to players that left the server

They are never going to receive them anyway.

Author: botder

Server/mods/deathmatch/logic/CPerPlayerEntity.cpp

@@ -240,24 +240,34 @@ void CPerPlayerEntity::DestroyEntity(CPlayer* pPlayer)
 void CPerPlayerEntity::BroadcastOnlyVisible(const CPacket& Packet)
 {
     // Are we synced? (if not we're not visible to anybody)
-    if (m_bIsSynced)
+    if (!m_bIsSynced)
+        return;
+
+    CPlayerManager* playerManager = g_pGame->GetPlayerManager();
+    CSendList       sendList;
+
+    for (std::set<CPlayer*>::iterator iter = m_Players.begin(); iter != m_Players.end(); /*manual increment*/)
     {
-        CPlayerManager* pPlayerManager = g_pGame->GetPlayerManager();
-        for (std::set<CPlayer*>::iterator iter = m_Players.begin(); iter != m_Players.end();)
+        CPlayer* player = *iter;
+
+        if (!playerManager->Exists(player))
         {
-            if (!pPlayerManager->Exists(*iter))
-            {
-                // Why does this happen?
-                // CLogger::ErrorPrintf( "CPerPlayerEntity removed invalid player from list: %08x", *iter );
-                m_Players.erase(iter++);
-            }
-            else
-                ++iter;
+            // Why does this happen?
+            // CLogger::ErrorPrintf("CPerPlayerEntity removed invalid player from list: %08x", player);
+            iter = m_Players.erase(iter);
+        }
+        else
+        {
+            ++iter;
+
+            if (player->IsLeavingServer())
+                continue;
         }
 
-        // Send it to all players we're visible to
-        CPlayerManager::Broadcast(Packet, m_Players);
+        sendList.push_back(player);
     }
+
+    CPlayerManager::Broadcast(Packet, sendList);
 }
 
 void CPerPlayerEntity::RemoveIdenticalEntries(std::set<CPlayer*>& List1, std::set<CPlayer*>& List2)

Server/mods/deathmatch/logic/CPlayer.cpp

@@ -270,6 +270,9 @@ uint CPlayer::Send(const CPacket& Packet)
     if (!CNetBufferWatchDog::CanSendPacket(Packet.GetPacketID()))
         return 0;
 
+    if (IsLeavingServer())
+        return 0;
+
     // Use the flags to determine how to send it
     NetServerPacketReliability Reliability;
     unsigned long              ulFlags = Packet.GetFlags();

Server/mods/deathmatch/logic/CPlayerManager.cpp

@@ -162,18 +162,15 @@ size_t CPlayerManager::BroadcastOnlyJoined(const CPacket& Packet, CPlayer* pSkip
     CSendList sendList;
 
     // Send the packet to each ingame player on the server except the skipped one
-    list<CPlayer*>::const_iterator iter = m_Players.begin();
-    for (; iter != m_Players.end(); iter++)
+    for (CPlayer* player : m_Players)
     {
-        CPlayer* pPlayer = *iter;
-        if (pPlayer != pSkip && pPlayer->IsJoined())
+        if (player != pSkip && player->IsJoined() && !player->IsLeavingServer())
         {
-            sendList.push_back(pPlayer);
+            sendList.push_back(player);
         }
     }
 
     CPlayerManager::Broadcast(Packet, sendList);
-
     return sendList.size();
 }
 
@@ -183,19 +180,15 @@ size_t CPlayerManager::BroadcastDimensionOnlyJoined(const CPacket& Packet, ushor
     CSendList sendList;
 
     // Send the packet to each ingame player on the server except the skipped one
-    list<CPlayer*>::const_iterator iter = m_Players.begin();
-    for (; iter != m_Players.end(); iter++)
+    for (CPlayer* player : m_Players)
     {
-        CPlayer* pPlayer = *iter;
-        if (pPlayer != pSkip && pPlayer->IsJoined())
+        if (player != pSkip && player->IsJoined() && !player->IsLeavingServer() && player->GetDimension() == usDimension)
         {
-            if (pPlayer->GetDimension() == usDimension)
-                sendList.push_back(pPlayer);
+            sendList.push_back(player);
         }
     }
 
     CPlayerManager::Broadcast(Packet, sendList);
-
     return sendList.size();
 }
 
@@ -205,18 +198,15 @@ size_t CPlayerManager::BroadcastOnlySubscribed(const CPacket& Packet, CElement*
     CSendList sendList;
 
     // Send the packet to each ingame player on the server except the skipped one
-    list<CPlayer*>::const_iterator iter = m_Players.begin();
-    for (; iter != m_Players.end(); iter++)
+    for (CPlayer* player : m_Players)
     {
-        CPlayer* pPlayer = *iter;
-        if (pPlayer != pSkip && pPlayer->IsJoined() && pPlayer->IsSubscribed(pElement, szName))
+        if (player != pSkip && player->IsJoined() && !player->IsLeavingServer() && player->IsSubscribed(pElement, szName))
         {
-            sendList.push_back(pPlayer);
+            sendList.push_back(player);
         }
     }
 
     CPlayerManager::Broadcast(Packet, sendList);
-
     return sendList.size();
 }
 
@@ -282,6 +272,7 @@ static void DoBroadcast(const CPacket& Packet, const std::multimap<ushort, CPlay
             {
                 CPlayer* pPlayer = s_it->second;
                 dassert(usBitStreamVersion == pPlayer->GetBitStreamVersion());
+                dassert(!pPlayer->IsLeavingServer());
                 g_pGame->SendPacket(Packet.GetPacketID(), pPlayer->GetSocket(), pBitStream, false, packetPriority, Reliability, Packet.GetPacketOrdering());
             }