Remove outdated community account handling

This also includes missing changes for 859e6ce

Author: botder

Server/mods/deathmatch/logic/CBan.h

@@ -70,13 +70,6 @@ class CBan
         m_strSerial = strSerial;
     };
 
-    const std::string& GetAccount() { return m_strAccount; };
-    void               SetAccount(const std::string& strAccount)
-    {
-        CBanManager::SetBansModified();
-        m_strAccount = strAccount;
-    };
-
     time_t  GetBanTimeRemaining();
     SString GetDurationDesc();
     SString GetReasonText() const;
@@ -90,7 +83,6 @@ class CBan
     std::string m_strBanner;
     std::string m_strReason;
     std::string m_strSerial;
-    std::string m_strAccount;
     time_t      m_tTimeOfBan;
     time_t      m_tTimeOfUnban;
     uint        m_uiScriptID;

Server/mods/deathmatch/logic/CBanManager.cpp

@@ -141,34 +141,6 @@ CBan* CBanManager::AddSerialBan(const SString& strSerial, CClient* pBanner, cons
     return NULL;
 }
 
-CBan* CBanManager::AddAccountBan(CPlayer* pPlayer, CClient* pBanner, const SString& strReason, time_t tTimeOfUnban)
-{
-    if (pPlayer)
-    {
-        if (!pPlayer->GetSerialUser().empty() && !IsAccountBanned(pPlayer->GetSerialUser().c_str()))
-        {
-            CBan* pBan = AddBan(pBanner->GetNick(), strReason, tTimeOfUnban);
-            pBan->SetNick(pPlayer->GetNick());
-            pBan->SetAccount(pPlayer->GetSerialUser());
-            return pBan;
-        }
-    }
-
-    return NULL;
-}
-
-CBan* CBanManager::AddAccountBan(const SString& strAccount, CClient* pBanner, const SString& strReason, time_t tTimeOfUnban)
-{
-    if (!IsAccountBanned(strAccount.c_str()))
-    {
-        CBan* pBan = AddBan(pBanner->GetNick(), strReason, tTimeOfUnban);
-        pBan->SetSerial(strAccount);
-        return pBan;
-    }
-
-    return NULL;
-}
-
 CBan* CBanManager::AddBan(const SString& strBanner, const SString& strReason, time_t tTimeOfUnban)
 {
     // Create the ban and assign its values
@@ -223,34 +195,6 @@ bool CBanManager::IsSerialBanned(const char* szSerial)
     return false;
 }
 
-bool CBanManager::IsAccountBanned(const char* szAccount)
-{
-    list<CBan*>::const_iterator iter = m_BanManager.begin();
-    for (; iter != m_BanManager.end(); iter++)
-    {
-        if ((*iter)->GetAccount() == szAccount)
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
-CBan* CBanManager::GetBanFromAccount(const char* szAccount)
-{
-    list<CBan*>::const_iterator iter = m_BanManager.begin();
-    for (; iter != m_BanManager.end(); iter++)
-    {
-        if ((*iter)->GetAccount() == szAccount)
-        {
-            return (*iter);
-        }
-    }
-
-    return NULL;
-}
-
 void CBanManager::RemoveBan(CBan* pBan)
 {
     if (m_BanManager.Contains(pBan))
@@ -388,15 +332,14 @@ bool CBanManager::LoadBanList()
         {
             if (pNode->GetTagName().compare("ban") == 0)
             {
-                std::string strIP = SafeGetValue(pNode, "ip"), strSerial = SafeGetValue(pNode, "serial"), strAccount = SafeGetValue(pNode, "account");
-                if (!strIP.empty() || !strSerial.empty() || !strAccount.empty())
+                std::string strIP = SafeGetValue(pNode, "ip"), strSerial = SafeGetValue(pNode, "serial");
+                if (!strIP.empty() || !strSerial.empty())
                 {
                     CBan* pBan = AddBan();
                     if (IsValidIP(strIP.c_str()))
                     {
                         pBan->SetIP(strIP);
                     }
-                    pBan->SetAccount(strAccount);
                     pBan->SetSerial(strSerial);
                     pBan->SetBanner(SafeGetValue(pNode, "banner"));
                     pBan->SetNick(SafeGetValue(pNode, "nick"));
@@ -466,7 +409,6 @@ void CBanManager::SaveBanList()
                     SafeSetValue(pNode, "nick", (*iter)->GetNick());
                     SafeSetValue(pNode, "ip", (*iter)->GetIP());
                     SafeSetValue(pNode, "serial", (*iter)->GetSerial());
-                    SafeSetValue(pNode, "account", (*iter)->GetAccount());
                     SafeSetValue(pNode, "banner", (*iter)->GetBanner());
                     SafeSetValue(pNode, "reason", (*iter)->GetReason());
                     SafeSetValue(pNode, "time", (unsigned int)(*iter)->GetTimeOfBan());

Server/mods/deathmatch/logic/CBanManager.h

@@ -28,18 +28,13 @@ class CBanManager
     CBan* AddSerialBan(CPlayer* pPlayer, CClient* pBanner = NULL, const SString& strReason = "", time_t tTimeOfUnban = 0);
     CBan* AddSerialBan(const SString& strSerial, CClient* pBanner = NULL, const SString& strReason = "", time_t tTimeOfUnban = 0);
 
-    CBan* AddAccountBan(CPlayer* pPlayer, CClient* pBanner = NULL, const SString& strReason = "", time_t tTimeOfUnban = 0);
-    CBan* AddAccountBan(const SString& szAccount, CClient* pBanner = NULL, const SString& strReason = "", time_t tTimeOfUnban = 0);
-
     CBan* AddBan(const SString& strBanner = "Console", const SString& strReason = "", time_t tTimeOfUnban = 0);
 
     CBan* GetBanFromScriptID(uint uiScriptID);
 
-    bool  IsSpecificallyBanned(const char* szIP);
-    bool  IsSerialBanned(const char* szSerial);
-    bool  IsAccountBanned(const char* szAccount);
-    CBan* GetBanFromAccount(const char* szAccount);
-    void  RemoveBan(CBan* pBan);
+    bool IsSpecificallyBanned(const char* szIP);
+    bool IsSerialBanned(const char* szSerial);
+    void RemoveBan(CBan* pBan);
 
     CBan* GetBanFromSerial(const char* szSerial);
     CBan* GetBanFromIP(const char* szIP);

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp

@@ -3092,18 +3092,14 @@ const std::string& CStaticFunctionDefinitions::GetPlayerSerial(CPlayer* pPlayer,
     return pPlayer->GetSerial(uiIndex);
 }
 
-const std::string& CStaticFunctionDefinitions::GetPlayerUserName(CPlayer* pPlayer)
+std::string CStaticFunctionDefinitions::GetPlayerUserName(CPlayer* pPlayer)
 {
-    assert(pPlayer);
-
-    return pPlayer->GetSerialUser();
+    return "";
 }
 
-const std::string& CStaticFunctionDefinitions::GetPlayerCommunityID(CPlayer* pPlayer)
+std::string CStaticFunctionDefinitions::GetPlayerCommunityID(CPlayer* pPlayer)
 {
-    assert(pPlayer);
-
-    return pPlayer->GetCommunityID();
+    return "";
 }
 
 bool CStaticFunctionDefinitions::GetPlayerBlurLevel(CPlayer* pPlayer, unsigned char& ucLevel)
@@ -5498,7 +5494,7 @@ bool CStaticFunctionDefinitions::BlowVehicle(CElement* pElement, std::optional<b
 
     CBitStream BitStream;
     BitStream.pBitStream->Write(vehicle->GenerateSyncTimeContext());
-    BitStream.pBitStream->WriteBit(createExplosion);            // only consumed by clients with at least eBitStreamVersion::VehicleBlowStateSupport
+    BitStream.pBitStream->WriteBit(createExplosion);
     m_pPlayerManager->BroadcastOnlyJoined(CElementRPCPacket(vehicle, BLOW_VEHICLE, *BitStream.pBitStream));
     return true;
 }
@@ -10941,12 +10937,8 @@ bool CStaticFunctionDefinitions::SendSyncIntervals(CPlayer* pPlayer)
         BitStream.pBitStream->Write(g_TickRateSettings.iObjectSync);
         BitStream.pBitStream->Write(g_TickRateSettings.iKeySyncRotation);
         BitStream.pBitStream->Write(g_TickRateSettings.iKeySyncAnalogMove);
-
-        if (pPlayer->CanBitStream(eBitStreamVersion::FixSyncerDistance))
-        {
-            BitStream.pBitStream->Write(g_TickRateSettings.iPedSyncerDistance);
-            BitStream.pBitStream->Write(g_TickRateSettings.iUnoccupiedVehicleSyncerDistance);
-        }
+        BitStream.pBitStream->Write(g_TickRateSettings.iPedSyncerDistance);
+        BitStream.pBitStream->Write(g_TickRateSettings.iUnoccupiedVehicleSyncerDistance);
 
         pPlayer->Send(CLuaPacket(SET_SYNC_INTERVALS, *BitStream.pBitStream));
     };
@@ -11810,19 +11802,18 @@ CBan* CStaticFunctionDefinitions::BanPlayer(CPlayer* pTargetPlayer, bool bIP, bo
     // Ban the player
     if (bIP)
         pBan = m_pBanManager->AddBan(pTargetPlayer, strResponsible, strReason, tUnban);
-    else if (bUsername || bSerial)
+    else if (bSerial)
         pBan = m_pBanManager->AddBan(strResponsible, strReason, tUnban);
 
     // If the ban was successful
     if (pBan)
     {
-        // Set the data if banned by either username or serial
-        if (bUsername)
-            pBan->SetAccount(pTargetPlayer->GetSerialUser());
+        // Set the data if banned by serial
         if (bSerial)
+        {
             pBan->SetSerial(pTargetPlayer->GetSerial());
-        if (bUsername || bSerial)
             pBan->SetNick(pTargetPlayer->GetNick());
+        }
 
         // Check if we passed a responsible player
         if (pResponsible)
@@ -11865,13 +11856,6 @@ CBan* CStaticFunctionDefinitions::BanPlayer(CPlayer* pTargetPlayer, bool bIP, bo
                 bBan = (pBan->GetIP() == pPlayer->GetSourceIP());
             }
 
-            // Check if the player's username matches the specified one, if specified, and he wasn't banned over IP yet
-            if (!bBan && bUsername && pBan->GetAccount().length() > 0)
-            {
-                const std::string& strPlayerUsername = pPlayer->GetSerialUser();
-                bBan = stricmp(strPlayerUsername.c_str(), pBan->GetAccount().c_str()) == 0;
-            }
-
             // Check if the player's serial matches the specified one, if specified, and he wasn't banned over IP or username yet
             if (!bBan && bSerial)
             {
@@ -11956,10 +11940,6 @@ CBan* CStaticFunctionDefinitions::AddBan(SString strIP, SString strUsername, SSt
     {
         pBan = m_pBanManager->AddBan(strResponsible, strReason, tUnban);
     }
-    else if (bUsernameSpecified && !m_pBanManager->IsAccountBanned(strUsername))
-    {
-        pBan = m_pBanManager->AddBan(strResponsible, strReason, tUnban);
-    }
 
     // If the ban was added
     if (pBan)
@@ -11995,8 +11975,6 @@ CBan* CStaticFunctionDefinitions::AddBan(SString strIP, SString strUsername, SSt
             strMessage = strMessage.substr(0, 255);
 
         // Set the account or serial if either one is set to be banned
-        if (bUsernameSpecified)
-            pBan->SetAccount(strUsername);
         if (bSerialSpecified)
             pBan->SetSerial(strSerial);
 
@@ -12046,13 +12024,6 @@ CBan* CStaticFunctionDefinitions::AddBan(SString strIP, SString strUsername, SSt
                 bBan = (strIP == pPlayer->GetSourceIP());
             }
 
-            // Check if the player's username matches the specified one, if specified, and he wasn't banned over IP yet
-            if (!bBan && bUsernameSpecified && strUsername.length() > 0)
-            {
-                const std::string& strPlayerUsername = pPlayer->GetSerialUser();
-                bBan = stricmp(strPlayerUsername.c_str(), strUsername.c_str()) == 0;
-            }
-
             // Check if the player's serial matches the specified one, if specified, and he wasn't banned over IP or username yet
             if (!bBan && bSerialSpecified)
             {
@@ -12168,11 +12139,6 @@ bool CStaticFunctionDefinitions::GetBanSerial(CBan* pBan, SString& strOutSerial)
 
 bool CStaticFunctionDefinitions::GetBanUsername(CBan* pBan, SString& strOutUsername)
 {
-    if (!pBan->GetAccount().empty())
-    {
-        strOutUsername = pBan->GetAccount();
-        return true;
-    }
     return false;
 }
 

Server/mods/deathmatch/logic/CStaticFunctionDefinitions.h

@@ -130,8 +130,8 @@ class CStaticFunctionDefinitions
     static bool               GetPlayerNametagColor(CPlayer* pPlayer, unsigned char& ucR, unsigned char& ucG, unsigned char& ucB);
     static bool               IsPlayerNametagShowing(CPlayer* pPlayer, bool& bShowing);
     static const std::string& GetPlayerSerial(CPlayer* pPlayer, uint uiIndex);
-    static const std::string& GetPlayerUserName(CPlayer* pPlayer);
-    static const std::string& GetPlayerCommunityID(CPlayer* pPlayer);
+    static std::string        GetPlayerUserName(CPlayer* pPlayer);
+    static std::string        GetPlayerCommunityID(CPlayer* pPlayer);
     static bool               GetPlayerBlurLevel(CPlayer* pPlayer, unsigned char& ucLevel);
     static bool               GetPlayerName(CElement* pElement, SString& strOutName);
     static bool               GetPlayerIP(CElement* pElement, SString& strOutIP);