feat(2.26): API, Refactoring (#17)

Author: Rushaway

addons/sourcemod/scripting/FixSprayExploit.sp

@@ -18,7 +18,7 @@
 
 
 
-#define PLUGIN_VERSION 		"2.25"
+#define PLUGIN_VERSION 		"2.26"
 
 /*=======================================================================================
 	Plugin Info:
@@ -32,6 +32,10 @@
 ========================================================================================
 	Change Log:
 
+2.26 (21-May-2025)
+	- Added native "SprayExploitFixer_LogCustom" to log custom messages. Requested by ".Rushaway".
+	- Added RegPluginLibrary "spray_exploit_fixer".
+
 2.25 (04-Jan-2025)
 	- Changes to the recent exploit fix. Thanks to "Madness (null138)" for fixing and reporting.
 
@@ -184,6 +188,7 @@
 
 #include <sourcemod>
 #include <sdktools>
+#include <spray_exploit>
 
 
 #define MAX_READ		50
@@ -240,6 +245,10 @@ public APLRes AskPluginLoad2(Handle myself, bool late, char[] error, int err_max
 	MarkNativeAsOptional("SBPP_BanPlayer");
 	MarkNativeAsOptional("MABanPlayer");
 
+	RegPluginLibrary("spray_exploit_fixer");
+
+	CreateNative("SprayExploitFixer_LogCustom", Native_LogCustom);
+
 	g_iEngine = GetEngineVersion();
 	g_bLate = late;
 
@@ -318,7 +327,7 @@ public Action OnPlayerRunCmd(int client, int &buttons, int &impulse, float vel[3
 		static char sTemp[PLATFORM_MAX_PATH];
 		GetPlayerJingleFile(client, sTemp, sizeof(sTemp));
 
-		Format(cc, sizeof(cc), "/%c%c/", sTemp[0], sTemp[1]);
+		FormatEx(cc, sizeof(cc), "/%c%c/", sTemp[0], sTemp[1]);
 		Format(sTemp, sizeof(sTemp), "%s%s.dat", g_sDownloads, sTemp);
 		ReplaceString(sTemp, sizeof(sTemp), "/cc/", cc);
 
@@ -607,7 +616,7 @@ void RecursiveSearchDirs(int client, ArrayList aList, int &count, int &counts, b
 				pos = FindCharInString(sPath, '/', true);
 				if( pos != -1 ) sPath[pos] = 0;
 
-				Format(sNew, sizeof(sNew), "%s/%s/%s", g_sMoveFiles, PATH_BACKUP, sPath[pos + 1]);
+				FormatEx(sNew, sizeof(sNew), "%s/%s/%s", g_sMoveFiles, PATH_BACKUP, sPath[pos + 1]);
 				if( FileExists(sNew, true) ) DeleteFile(sNew, true);
 
 				if( pos != -1 ) sPath[pos] = '/';
@@ -761,7 +770,7 @@ Action PlayerDecal(const char[] te_name, const int[] Players, int numClients, fl
 		ReplaceString(g_sFilename, sizeof(g_sFilename), g_sDownloads, "");
 		ReplaceString(g_sFilename, sizeof(g_sFilename), ".dat", "");
 
-		Format(cc, sizeof(cc), "/%c%c/", g_sFilename[0], g_sFilename[1]);
+		FormatEx(cc, sizeof(cc), "/%c%c/", g_sFilename[0], g_sFilename[1]);
 		Format(g_sFilename, sizeof(g_sFilename), "%s%s.dat", g_sDownloads, g_sFilename);
 		ReplaceString(g_sFilename, sizeof(g_sFilename), "/cc/", cc);
 
@@ -777,9 +786,9 @@ Action PlayerDecal(const char[] te_name, const int[] Players, int numClients, fl
 	{
 		static char auth[64];
 		if ( g_sAuth[client][6] == 'I' )
-			Format(auth, sizeof(auth), "Unverified: %s", g_sAuthUnverified[client]);
+			FormatEx(auth, sizeof(auth), "Unverified: %s", g_sAuthUnverified[client]);
 		else
-			Format(auth, sizeof(auth), "%s", g_sAuth[client]);
+			FormatEx(auth, sizeof(auth), "%s", g_sAuth[client]);
 
 		if( FileExists(g_sFilename) )
 		{
@@ -942,9 +951,9 @@ public Action OnFileReceive(int client, const char[] sFile)
 		{
 			static char auth[64];
 			if ( g_sAuth[client][6] == 'I' )
-				Format(auth, sizeof(auth), "Unverified: %s", g_sAuthUnverified[client]);
+				FormatEx(auth, sizeof(auth), "Unverified: %s", g_sAuthUnverified[client]);
 			else
-				Format(auth, sizeof(auth), "%s", g_sAuth[client]);
+				FormatEx(auth, sizeof(auth), "%s", g_sAuth[client]);
 
 			LogCustom("File received: %s from (%N) [%s]", sFile, client, auth);
 		}
@@ -1006,9 +1015,9 @@ void FileCheck()
 					{
 						static char auth[64];
 						if ( g_sAuth[client][6] == 'I' )
-							Format(auth, sizeof(auth), "Unverified: %s", g_sAuthUnverified[client]);
+							FormatEx(auth, sizeof(auth), "Unverified: %s", g_sAuthUnverified[client]);
 						else
-							Format(auth, sizeof(auth), "%s", g_sAuth[client]);
+							FormatEx(auth, sizeof(auth), "%s", g_sAuth[client]);
 
 						if( g_hCvarLog.IntValue ) LogCustom("Invalid spray: %s from (%N) [%s]", g_sFilename, client, auth);
 						if( g_hCvarMsg.IntValue ) PrintToServer("[Spray Exploit] Invalid spray: %s: %02d (%02X <> %02X) from (%N) [%s]", g_sFilename, i, iRead[i], g_iVal[i], client, auth);
@@ -1048,7 +1057,7 @@ int ValFile(int iRead[sizeof(g_iVal)])
 		return -1;
 	}
 
-	if( iRead[16] == 80 && iRead[24] > 1 )
+	if( iRead[21] == 42 && iRead[24] > 1 || iRead[16] == 80 && iRead[24] > 1)
 	{
 		return 24;
 	}
@@ -1066,13 +1075,13 @@ int ValFile(int iRead[sizeof(g_iVal)])
 				case 8:	read = iRead[i] <= 5;
 				case 16, 18:
 				{
-					Format(bytes, sizeof(bytes), "%02X%02X", iRead[i+1], iRead[i]);
+					FormatEx(bytes, sizeof(bytes), "%02X%02X", iRead[i+1], iRead[i]);
 					n = HexToDec(bytes);
 					if( n < 0 || n > 8192 ) read = false;
 				}
 				case 20:
 				{
-					Format(bytes, sizeof(bytes), "%02X%02X%02X%02X", iRead[i+3], iRead[i+2], iRead[i+1], iRead[i]);
+					FormatEx(bytes, sizeof(bytes), "%02X%02X%02X%02X", iRead[i+3], iRead[i+2], iRead[i+1], iRead[i]);
 					n = HexToDec(bytes);
 					if( n & (0x8000|0x10000|0x800000) ) read = false;
 				}
@@ -1132,3 +1141,11 @@ void LogCustom(const char[] format, any ...)
 	FlushFile(file);
 	delete file;
 }
+
+public int Native_LogCustom(Handle plugin, int numParams)
+{
+	char sBuffer[2048];
+	FormatNativeString(0, 1, 2, sizeof(sBuffer), _, sBuffer);
+	LogCustom(sBuffer);
+	return 1;
+}

addons/sourcemod/scripting/include/spray_exploit.inc

@@ -0,0 +1,55 @@
+/*
+*	Spray Exploit Fixer
+*	Copyright (C) 2025 Silvers
+*
+*	This program is free software: you can redistribute it and/or modify
+*	it under the terms of the GNU General Public License as published by
+*	the Free Software Foundation, either version 3 of the License, or
+*	(at your option) any later version.
+*
+*	This program is distributed in the hope that it will be useful,
+*	but WITHOUT ANY WARRANTY; without even the implied warranty of
+*	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*	GNU General Public License for more details.
+*
+*	You should have received a copy of the GNU General Public License
+*	along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+#if defined _spray_exploit_included
+ #endinput
+#endif
+#define _spray_exploit_included
+
+
+public SharedPlugin __pl_spray_exploit = 
+{
+	name = "spray_exploit_fixer",
+	file = "spray_exploit_fixer.smx",
+#if defined REQUIRE_PLUGIN
+	required = 1,
+#else
+	required = 0,
+#endif
+};
+
+
+
+/**
+* @brief Triggers when a clients spray was detected
+*
+* @param	client		client index of the detected player
+* @param	index		position of detection
+* @param	value		value detected
+*
+* @noreturn
+*/
+forward void OnSprayExploit(int client, int index, int value);
+
+/**
+ * Log a message into logs/spray_downloads.log
+ *
+ * @param format	Message to log
+ * @noreturn
+*/
+native void SprayExploitFixer_LogCustom(const char[] format, any ...);