Make suggested changes

Author: Nico8340

Client/mods/deathmatch/logic/CPacketHandler.h

@@ -38,12 +38,12 @@ class CPacketHandler
         ELEMENT_FAILURE,
         GENERAL_REFUSED,
         SERIAL_VERIFICATION,
-        SERIAL_DUPLICATE,
         CONNECTION_DESYNC,
         BAN,
         KICK,
         CUSTOM,
-        SHUTDOWN
+        SHUTDOWN,
+        SERIAL_DUPLICATE
     };
 
     struct SEntityDependantStuff

Server/mods/deathmatch/logic/CGame.cpp

@@ -1805,7 +1805,11 @@ void CGame::Packet_PlayerJoinData(CPlayerJoinDataPacket& Packet)
             CLogger::LogPrintf("CONNECT: %s failed to connect (Serial already in use) (%s)\n", szNick, strIPAndSerial.c_str());
 
             // Tell the player the problem
-            DisconnectPlayer(this, *pPlayer, CPlayerDisconnectedPacket::SERIAL_DUPLICATE);
+            if (pPlayer->CanBitStream(eBitStreamVersion::CheckDuplicateSerials))
+                DisconnectPlayer(this, *pPlayer, CPlayerDisconnectedPacket::SERIAL_DUPLICATE);
+            else
+                DisconnectPlayer(this, *pPlayer, CPlayerDisconnectedPacket::KICK);
+
             return;
         }
 

Server/mods/deathmatch/logic/CPlayerManager.cpp

@@ -138,7 +138,7 @@ CPlayer* CPlayerManager::Get(const char* szNick, bool bCaseSensitive)
     return NULL;
 }
 
-const CPlayer* CPlayerManager::GetBySerial(const std::string serial) const noexcept
+CPlayer* CPlayerManager::GetBySerial(const std::string_view serial) const noexcept
 {
     for (const auto& player : m_Players)
     {

Server/mods/deathmatch/logic/CPlayerManager.h

@@ -17,7 +17,6 @@ class CPlayerManager;
 #include "packets/CPacket.h"
 #include "CPlayer.h"
 #include "../Config.h"
-#include <string>
 
 class CPlayerManager
 {
@@ -41,7 +40,7 @@ class CPlayerManager
 
     CPlayer* Get(const NetServerPlayerID& PlayerSocket);
     CPlayer* Get(const char* szNick, bool bCaseSensitive = false);
-    const CPlayer* GetBySerial(const std::string serial) const noexcept;
+    CPlayer* GetBySerial(const std::string_view serial) const noexcept;
 
     std::list<CPlayer*>::const_iterator IterBegin() { return m_Players.begin(); };
     std::list<CPlayer*>::const_iterator IterEnd() { return m_Players.end(); };

Server/mods/deathmatch/logic/packets/CPlayerDisconnectedPacket.h

@@ -35,12 +35,12 @@ class CPlayerDisconnectedPacket final : public CPacket
         ELEMENT_FAILURE,
         GENERAL_REFUSED,
         SERIAL_VERIFICATION,
-        SERIAL_DUPLICATE,
         CONNECTION_DESYNC,
         BAN,
         KICK,
         CUSTOM,
-        SHUTDOWN
+        SHUTDOWN,
+        SERIAL_DUPLICATE
     };
 
     CPlayerDisconnectedPacket(const char* szReason);

Shared/sdk/net/bitstream.h

@@ -572,6 +572,10 @@ enum class eBitStreamVersion : unsigned short
     // 2024-09-04
     RespawnObject_Serverside,
 
+    // Add check_duplicate_serials
+    // 2024-09-04
+    CheckDuplicateSerials,
+
     // This allows us to automatically increment the BitStreamVersion when things are added to this enum.
     // Make sure you only add things above this comment.
     Next,