R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-09-18 15:59:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Pylon system changes.

Browse Source
This commit is contained in:
IcePixelx
2022-01-09 14:35:43 +01:00
parent 98a428ace9
commit ae09372cc7
4 changed files with 91 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
r5dev/public/bansystem.cpp
View File

@@ -81,7 +81,11 @@ void CBanSystem::AddEntry(std::string svIpAddress, std::int64_t nOriginID)
{
if (!svIpAddress.empty() && nOriginID > 0) // Check if args are valid.
{
vsvBanList.push_back(std::make_pair(svIpAddress, nOriginID)); // Push it back into the vector.
auto it = std::find(vsvBanList.begin(), vsvBanList.end(), std::make_pair(svIpAddress, nOriginID)); // Check if we have this entry already.
if (it == vsvBanList.end()) // We don't have that entry?
{
vsvBanList.push_back(std::make_pair(svIpAddress, nOriginID)); // Add it.
}
}
}
@@ -102,19 +106,19 @@ void CBanSystem::DeleteEntry(std::string svIpAddress, std::int64_t nOriginID)
//-----------------------------------------------------------------------------
// Purpose: adds a connect refuse entry to the refuselist
//-----------------------------------------------------------------------------
void CBanSystem::AddConnectionRefuse(std::string svError, int nUserID)
void CBanSystem::AddConnectionRefuse(std::string svError, std::int64_t nOriginID)
{
if (vsvrefuseList.empty())
{
vsvrefuseList.push_back(std::make_pair(svError, nUserID));
vsvrefuseList.push_back(std::make_pair(svError, nOriginID));
}
else
{
for (int i = 0; i < vsvrefuseList.size(); i++) // Loop through vector.
{
if (vsvrefuseList[i].second != nUserID) // Do any entries match our vector?
if (vsvrefuseList[i].second != nOriginID) // Do any entries match our vector?
{
vsvrefuseList.push_back(std::make_pair(svError, nUserID)); // Push it back into the vector.
vsvrefuseList.push_back(std::make_pair(svError, nOriginID)); // Push it back into the vector.
}
}
}
@@ -123,11 +127,11 @@ void CBanSystem::AddConnectionRefuse(std::string svError, int nUserID)
//-----------------------------------------------------------------------------
// Purpose: deletes an entry in the refuselist
//-----------------------------------------------------------------------------
void CBanSystem::DeleteConnectionRefuse(int nUserID)
void CBanSystem::DeleteConnectionRefuse(std::int64_t nOriginID)
{
for (int i = 0; i < vsvrefuseList.size(); i++) // Loop through vector.
{
if (vsvrefuseList[i].second == nUserID) // Do any entries match our vector?
if (vsvrefuseList[i].second == nOriginID) // Do any entries match our vector?
{
vsvrefuseList.erase(vsvrefuseList.begin() + i); // If so erase that vector element.
}

6
r5dev/public/include/bansystem.h
View File

@@ -10,13 +10,13 @@ public:
void Save();
void AddEntry(std::string svIpAddress, std::int64_t nOriginID);
void DeleteEntry(std::string svIpAddress, std::int64_t nOriginID);
void AddConnectionRefuse(std::string svError, int nUserID);
void DeleteConnectionRefuse(int nUserID);
void AddConnectionRefuse(std::string svError, std::int64_t nOriginID);
void DeleteConnectionRefuse(std::int64_t nUserID);
bool IsBanned(std::string svIpAddress, std::int64_t nOriginID);
bool IsRefuseListValid();
bool IsBanListValid();
std::vector<std::pair<std::string, int>> vsvrefuseList = {};;
std::vector<std::pair<std::string, std::int64_t>> vsvrefuseList = {};;
private:
std::vector<std::pair<std::string, std::int64_t>> vsvBanList = {};
};