Update to 2.13

Author: Rushaway

addons/sourcemod/scripting/FixSprayExploit.sp

@@ -18,7 +18,7 @@
 
 
 
-#define PLUGIN_VERSION 		"2.10"
+#define PLUGIN_VERSION 		"2.13"
 
 /*=======================================================================================
 	Plugin Info:
@@ -32,6 +32,16 @@
 ========================================================================================
 	Change Log:
 
+2.13 (22-May-2022)
+	- More detailed "LogAction" when kicking or banning clients.
+
+2.12 (22-May-2022)
+	- Added some more "LogAction" when kicking or banning clients.
+
+2.11 (22-May-2022)
+	- Added cvar "spray_exploit_fixer_kick" to kick clients. Ban cvar overrides this. Requested by ".Rushaway".
+	- Changes to fix not kicking or banning clients under some conditions.
+
 2.10 (23-Apr-2022)
 	- Fixed the plugin blocking sprays on some servers. Thanks to "SuperConker" for reporting and lots of testing.
 
@@ -130,7 +140,7 @@
 int g_iVal[] = {86,84,70,0,7,0,0,0,42,0,0,0,42,0,0,0,42,42,42,42,42,42,42,42,42,42,42,0,0,0,0,0,0,0,0,0};
 char g_sFilename[PLATFORM_MAX_PATH];
 char g_sDownloads[PLATFORM_MAX_PATH];
-ConVar g_hCvarBan, g_hCvarLog, g_hCvarPath;
+ConVar g_hCvarBan, g_hCvarKick, g_hCvarLog, g_hCvarPath;
 EngineVersion g_iEngine;
 StringMap g_smChecked;
 float g_fTime;
@@ -206,7 +216,10 @@ public void OnPluginStart()
 
 	CreateConVar(					"spray_exploit_fixer",			PLUGIN_VERSION,		"Spray Exploit Fixer plugin version.", FCVAR_DONTRECORD);
 	if( g_iEngine != Engine_TF2 )
+	{
 		g_hCvarBan = CreateConVar(	"spray_exploit_fixer_ban",		"0",				"0=Off. 1=Ban users who trigger invalid sprays (may still be some false positives).");
+		g_hCvarKick = CreateConVar(	"spray_exploit_fixer_kick",		"0",				"0=Off. 1=Kick users who trigger invalid sprays (may still be some false positives).");
+	}
 	g_hCvarLog = CreateConVar(		"spray_exploit_fixer_log",		"1",				"Logging saved to sourcemod/logs/spray_downloads.log: 0=Off. 1=Log all user uploads. 2=Log invalid sprays only.");
 	g_hCvarPath = CreateConVar(		"spray_exploit_fixer_path",		g_sDownloads,		"Path to the downloads folder of sprays. Add /cc/ if sprays are stored in individual 2 character folders. Must contain trailing / slash.");
 	AutoExecConfig(true);
@@ -267,7 +280,7 @@ public Action OnPlayerRunCmd(int client, int &buttons, int &impulse, float vel[3
 		Format(sTemp, sizeof(sTemp), "%s%s.dat", g_sDownloads, sTemp);
 		ReplaceString(sTemp, sizeof(sTemp), "/cc/", cc);
 
-		int val;
+		bool val;
 		if( g_smChecked.GetValue(sTemp, val) )
 		{
 			if( !val )
@@ -298,7 +311,7 @@ public Action CmdSprays(int client, int args)
 		return Plugin_Handled;
 	}
 
-	PrintToServer("[Sprays] checking files, please wait...");
+	ReplyToCommand(client, "[Sprays] checking files, please wait...");
 
 	int count, counts;
 	g_bProc = true;
@@ -378,7 +391,7 @@ void RecursiveSearchDirs(int client, const char[] sDir, int &count, int &counts,
 							{
 								count++;
 
-								PrintToServer("Invalid file: %s: %02d (%02X <> %02X)", sPath, i, iRead[i], g_iVal[i]);
+								PrintToConsole(client, "Invalid file: %s: %02d (%02X <> %02X)", sPath, i, iRead[i], g_iVal[i]);
 							}
 						}
 					}
@@ -408,7 +421,7 @@ void RecursiveSearchDirs(int client, const char[] sDir, int &count, int &counts,
 	if( level == dirs )
 	{
 		g_bProc = false;
-		ReplyToCommand(client, "Downloads checked. Found %d of %d invalid. Took %0.2f seconds.", count, counts, GetEngineTime() - g_fTime);
+		ReplyToCommand(client, "[Sprays] downloads checked. Found %d of %d invalid. Took %0.2f seconds.", count, counts, GetEngineTime() - g_fTime);
 	}
 }
 
@@ -472,6 +485,8 @@ public Action PlayerDecal(const char[] te_name, const int[] Players, int numClie
 		{
 			if( g_hCvarLog.IntValue ) LogCustom("Blocked invalid spray: %s from (%N) [%s]", g_sFilename, client, auth);
 			PrintToServer("Blocked invalid spray: %s from (%N) [%s]", g_sFilename, client, auth);
+
+			TestClient(client);
 		}
 		else
 		{
@@ -551,6 +566,36 @@ int GetClientFromJingle()
 	return 0;
 }
 
+void TestClient(int client)
+{
+	if( g_iEngine != Engine_TF2 && client )
+	{
+		if( g_hCvarBan.IntValue )
+		{
+			if( g_bSourceBans )
+			{
+				SBPP_BanPlayer(0, client, 0, "[Spray Exploit] Invalid spray");
+				LogAction(client, -1, "[Spray Exploit] \"%L\" Banned for invalid Spray.", client);
+			}
+			else if( g_bMaterialAdmin )
+			{
+				MABanPlayer(0, client, MA_BAN_STEAM, 0, "[Spray Exploit] Invalid spray");
+				LogAction(client, -1, "[Spray Exploit] \"%L\" Banned for invalid Spray.", client);
+			}
+			else
+			{
+				BanClient(client, 0, BANFLAG_AUTO, "[Spray Exploit] Invalid spray");
+				LogAction(client, -1, "[Spray Exploit] \"%L\" Banned for invalid Spray.", client);
+			}
+		}
+		else if( g_hCvarKick.IntValue )
+		{
+			KickClient(client, "Invalid spray. Please change it.");
+			LogAction(client, -1, "[Spray Exploit] \"%L\" kicked for invalid Spray.", client);
+		}
+	}
+}
+
 public Action OnFileReceive(int client, const char[] sFile)
 {
 	strcopy(g_sFilename, sizeof(g_sFilename), sFile);
@@ -626,24 +671,7 @@ void FileCheck()
 						PrintToServer("Invalid spray: %s: %02d (%02X <> %02X)", g_sFilename, i, iRead[i], g_iVal[i]);
 					}
 
-					if( g_iEngine != Engine_TF2 )
-					{
-						if( client && g_hCvarBan.IntValue )
-						{
-							if( g_bSourceBans )
-							{
-								SBPP_BanPlayer(0, client, 0, "[Spray Exploit] Invalid spray");
-							}
-							else if( g_bMaterialAdmin )
-							{
-								MABanPlayer(0, client, MA_BAN_STEAM, 0, "[Spray Exploit] Invalid spray");
-							}
-							else
-							{
-								BanClient(client, 0, BANFLAG_AUTO, "[Spray Exploit] Invalid spray");
-							}
-						}
-					}
+					TestClient(client);
 
 					ConfigFile(false);
 					return;
@@ -652,7 +680,7 @@ void FileCheck()
 				ConfigFile(true);
 			} else {
 				if( g_hCvarLog.IntValue ) LogCustom("Missing file: %s", g_sFilename);
-				PrintToServer("Missing file: %s", g_sFilename);
+				PrintToServer("[Sprays] Missing file: %s", g_sFilename);
 			}
 		}
 	}
@@ -759,4 +787,4 @@ void LogCustom(const char[] format, any ...)
 	file.WriteLine("%s: %s", sTime, buffer);
 	FlushFile(file);
 	delete file;
-}
+}