From 38c94eda272b038f842d87554845f1d4f0dee57a Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Sun, 28 Aug 2022 00:11:33 +0200
Subject: [PATCH] Banlist writing optimizations

* Only write if there is something to write.
* Don't write each iteration, write after the loops are finished.
---
 r5dev/networksystem/bansystem.cpp |  5 +++++
 r5dev/vstdlib/callback.cpp        | 34 ++++++++++++++++++++-----------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/r5dev/networksystem/bansystem.cpp b/r5dev/networksystem/bansystem.cpp
index 48167b1d..d36e2601 100644
--- a/r5dev/networksystem/bansystem.cpp
+++ b/r5dev/networksystem/bansystem.cpp
@@ -66,6 +66,11 @@ void CBanSystem::Load(void)
 			m_vBanList.push_back(std::make_pair(svIpAddress, nOriginID));
 		}
 	}
+	else
+	{
+		// File no longer accessible, assume they want all bans dropped.
+		m_vBanList.clear();
+	}
 }
 
 //-----------------------------------------------------------------------------
diff --git a/r5dev/vstdlib/callback.cpp b/r5dev/vstdlib/callback.cpp
index 27a804ec..f8204f66 100644
--- a/r5dev/vstdlib/callback.cpp
+++ b/r5dev/vstdlib/callback.cpp
@@ -202,6 +202,8 @@ void Host_Ban_f(const CCommand& args)
 		return;
 	}
 
+	bool bSave = false;
+
 	for (int i = 0; i < MAX_PLAYERS; i++)
 	{
 		if (CClient* pClient = g_pClient->GetClient(i))
@@ -212,14 +214,21 @@ void Host_Ban_f(const CCommand& args)
 				{
 					if (strcmp(args.Arg(1), pNetChan->GetName()) == NULL) // Our wanted name?
 					{
-						g_pBanSystem->AddEntry(pNetChan->GetAddress(), pClient->GetOriginID());
-						g_pBanSystem->Save();
+						if (g_pBanSystem->AddEntry(pNetChan->GetAddress(), pClient->GetOriginID() && !bSave))
+						{
+							bSave = true;
+						}
 						NET_DisconnectClient(pClient, i, "Banned from server", 0, true);
 					}
 				}
 			}
 		}
 	}
+
+	if (bSave)
+	{
+		g_pBanSystem->Save();
+	}
 }
 
 /*
@@ -230,13 +239,13 @@ Host_BanID_f
 void Host_BanID_f(const CCommand& args)
 {
 	if (args.ArgC() < 2)
-	{
 		return;
-	}
 
 	try
 	{
 		bool bOnlyDigits = args.HasOnlyDigits(1);
+		bool bSave = false;
+
 		for (int i = 0; i < MAX_PLAYERS; i++)
 		{
 			CClient* pClient = g_pClient->GetClient(i);
@@ -254,35 +263,36 @@ void Host_BanID_f(const CCommand& args)
 				{
 					uint64_t nOriginID = pClient->GetOriginID();
 					if (nOriginID != nTargetID)
-					{
 						continue;
-					}
 				}
 				else // If its not try by handle.
 				{
 					uint64_t nClientID = static_cast<uint64_t>(pClient->GetHandle());
 					if (nClientID != nTargetID)
-					{
 						continue;
-					}
 				}
 
-				g_pBanSystem->AddEntry(pNetChan->GetAddress(), pClient->GetOriginID());
+				if (g_pBanSystem->AddEntry(pNetChan->GetAddress(), pClient->GetOriginID()) && !bSave)
+					bSave = true;
+
 				g_pBanSystem->Save();
 				NET_DisconnectClient(pClient, i, "Banned from server", 0, true);
 			}
 			else
 			{
 				if (strcmp(args.Arg(1), pNetChan->GetAddress()) != NULL)
-				{
 					continue;
-				}
 
-				g_pBanSystem->AddEntry(pNetChan->GetAddress(), pClient->GetOriginID());
+				if (g_pBanSystem->AddEntry(pNetChan->GetAddress(), pClient->GetOriginID()) && !bSave)
+					bSave = true;
+
 				g_pBanSystem->Save();
 				NET_DisconnectClient(pClient, i, "Banned from server", 0, true);
 			}
 		}
+
+		if (bSave)
+			g_pBanSystem->Save();
 	}
 	catch (std::exception& e)
 	{