Update Left4DHooks to 1.159

https://forums.alliedmods.net/showthread.php?t=321696

Author: SirPlease

addons/sourcemod/gamedata/left4dhooks.l4d2.txt

@@ -3040,7 +3040,7 @@
 			"CGrenadeLauncher_Projectile::Explode"
 			{
 				"library"	"server"
-				"linux"		"@_ZN27CGrenadeLauncher_Projectile12ExplodeTouchEP11CBaseEntity"
+				"linux"		"@_ZN27CGrenadeLauncher_Projectile7ExplodeEP10CGameTracei"
 				"windows"	"\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x2A\x2A\xA1\x2A\x2A\x2A\x2A\x33\x2A\x89\x2A\x2A\x8B\x2A\x2A\x53\x56\x8B\x2A\x8B\x2A\x2A\x2A\x2A\x2A\xC1\x2A\x2A\x57"
 				/* ? ? ? ? ? ? ? ? ? A1 ? ? ? ? 33 ? 89 ? ? 8B ? ? 53 56 8B ? 8B ? ? ? ? ? C1 ? ? 57 */
 			}

addons/sourcemod/plugins/left4dhooks.smx

@@ -1360,6 +1360,7 @@ forward void L4D_OnSpawnSpecial_PostHandled(int client, int zombieClass, const f
 /**
  * @brief Called whenever ZombieManager::SpawnTank(Vector&,QAngle&) is invoked
  * @remarks Not invoked if z_spawn tank is used and it gives a ghosted/dead player tank
+ * @remarks This sometimes triggers every frame or so, in L4D2 "c7m3_port" map on Windows, after leaving the saferoom in Versus
  *
  * @param vecPos		Vector coordinate where tank is spawned
  * @param vecAng		QAngle where tank will be facing
@@ -1372,6 +1373,7 @@ forward Action L4D_OnSpawnTank(const float vecPos[3], const float vecAng[3]);
  * @brief Called whenever ZombieManager::SpawnTank(Vector&,QAngle&) is invoked
  * @remarks Not invoked if z_spawn tank is used and it gives a ghosted/dead player tank
  * @remarks This forward will not trigger if the relative pre-hook forward has been blocked with Plugin_Handled
+ * @remarks This sometimes triggers every frame or so, in L4D2 "c7m3_port" map on Windows, after leaving the saferoom in Versus, client index will be -1
  *
  * @param client		The client index who spawned
  * @param vecPos		Vector coordinate where tank is spawned
@@ -2288,7 +2290,7 @@ forward void L4D_TankRock_BounceTouch_PostHandled(int tank, int rock, int entity
  * @param tank_index		Client index of the tank
  * @param enterStasis		Is the tank in stasis
  *
- * @return				Plugin_Handled to block window from showing and to keep Tank Bot, Plugin_Changed to use overwritten values from plugin, Plugin_Continue otherwise
+ * @return					Plugin_Handled to block window from showing and to keep Tank Bot, Plugin_Changed to use overwritten values from plugin, Plugin_Continue otherwise
  */
 forward Action L4D_OnTryOfferingTankBot(int tank_index, bool &enterStasis);
 

addons/sourcemod/scripting/include/left4dhooks.inc

@@ -447,9 +447,9 @@ void SetupDetours(GameData hGameData = null)
 
 	if( g_bLeft4Dead2 )
 	{
-		CreateDetour(g_bLinuxOS ? hGameData : g_hTempGameData,		DTR_CVomitJarProjectile_Create_Pre,		DTR_CVomitJarProjectile_Create_Post,			"L4DD::CVomitJarProjectile::Create",								"L4D_MolotovProjectile_Pre");
-		CreateDetour(g_bLinuxOS ? hGameData : g_hTempGameData,		DTR_CVomitJarProjectile_Create_Pre,		DTR_CVomitJarProjectile_Create_Post,			"L4DD::CVomitJarProjectile::Create",								"L4D_MolotovProjectile_Post",					true);
-		CreateDetour(g_bLinuxOS ? hGameData : g_hTempGameData,		DTR_CVomitJarProjectile_Create_Pre,		DTR_CVomitJarProjectile_Create_Post,			"L4DD::CVomitJarProjectile::Create",								"L4D_MolotovProjectile_PostHandled",			true);
+		CreateDetour(g_bLinuxOS ? hGameData : g_hTempGameData,		DTR_CVomitJarProjectile_Create_Pre,		DTR_CVomitJarProjectile_Create_Post,			"L4DD::CVomitJarProjectile::Create",								"L4D2_VomitJarProjectile_Pre");
+		CreateDetour(g_bLinuxOS ? hGameData : g_hTempGameData,		DTR_CVomitJarProjectile_Create_Pre,		DTR_CVomitJarProjectile_Create_Post,			"L4DD::CVomitJarProjectile::Create",								"L4D2_VomitJarProjectile_Post",					true);
+		CreateDetour(g_bLinuxOS ? hGameData : g_hTempGameData,		DTR_CVomitJarProjectile_Create_Pre,		DTR_CVomitJarProjectile_Create_Post,			"L4DD::CVomitJarProjectile::Create",								"L4D2_VomitJarProjectile_PostHandled",			true);
 
 		CreateDetour(g_bLinuxOS ? hGameData : g_hTempGameData,		DTR_CGrenadeLauncherProjectile_Create_Pre,	DTR_CGrenadeLauncherProjectile_Create_Post,	"L4DD::CGrenadeLauncher_Projectile::Create",						"L4D2_GrenadeLauncherProjectile_Pre");
 		CreateDetour(g_bLinuxOS ? hGameData : g_hTempGameData,		DTR_CGrenadeLauncherProjectile_Create_Pre,	DTR_CGrenadeLauncherProjectile_Create_Post,	"L4DD::CGrenadeLauncher_Projectile::Create",						"L4D2_GrenadeLauncherProjectile_Post",			true);
@@ -1247,8 +1247,6 @@ MRESReturn Spawn_TankWitch_Post(Handle hForward, Handle hForward2, DHookReturn h
 	Call_PushArray(a2, sizeof(a2));
 	Call_Finish();
 
-	// g_bBlock_Spawn_TankWitch = false;
-
 	return MRES_Ignored;
 }
 
@@ -3518,7 +3516,8 @@ MRESReturn DTR_CTerrorPlayer_OnIncapacitatedAsSurvivor_Post(int pThis, DHookRetu
 MRESReturn DTR_CTerrorPlayer_DropWeapons(int pThis, DHookReturn hReturn) // Forward "L4D_OnDeathDroppedWeapons"
 {
 	//PrintToServer("##### DTR_CTerrorPlayer_DropWeapons");
-
+	if( pThis < 1 || pThis > MaxClients ) return MRES_Ignored;
+	if( !IsClientInGame(pThis) ) return MRES_Ignored;
 	if( !IsPlayerAlive(pThis) ) return MRES_Ignored; // Triggered before round_start or so but players are dead at this point, should only trigger when still alive
 
 	// Get held object if non-weapon
@@ -4816,11 +4815,11 @@ MRESReturn DTR_InfoChangelevel_SaveEntities_Post_L4D2(int pThis) // Forward "L4D
 	return MRES_Ignored;
 }
 
-bool g_hBlock_CTerrorPlayer_TransitionRestore;
+bool g_bBlock_CTerrorPlayer_TransitionRestore;
 MRESReturn DTR_CTerrorPlayer_TransitionRestore(int pThis, DHookReturn hReturn)
 {
 	//PrintToServer("##### DTR_CTerrorPlayer_TransitionRestore");
-	g_hBlock_CTerrorPlayer_TransitionRestore = false;
+	g_bBlock_CTerrorPlayer_TransitionRestore = false;
 
 	Action aResult = Plugin_Continue;
 	Call_StartForward(g_hFWD_CTerrorPlayer_TransitionRestore);
@@ -4829,7 +4828,7 @@ MRESReturn DTR_CTerrorPlayer_TransitionRestore(int pThis, DHookReturn hReturn)
 
 	if( aResult == Plugin_Handled )
 	{
-		g_hBlock_CTerrorPlayer_TransitionRestore = true;
+		g_bBlock_CTerrorPlayer_TransitionRestore = true;
 
 		hReturn.Value = 0;
 		return MRES_Supercede;
@@ -4843,7 +4842,7 @@ MRESReturn DTR_CTerrorPlayer_TransitionRestore_Post(int pThis, DHookReturn hRetu
 	//PrintToServer("##### DTR_CTerrorPlayer_TransitionRestore_Post");
 	Address iReturn = hReturn.Value;
 
-	Call_StartForward(g_hBlock_CTerrorPlayer_TransitionRestore ? g_hFWD_CTerrorPlayer_TransitionRestore_PostHandled : g_hFWD_CTerrorPlayer_TransitionRestore_Post);
+	Call_StartForward(g_bBlock_CTerrorPlayer_TransitionRestore ? g_hFWD_CTerrorPlayer_TransitionRestore_PostHandled : g_hFWD_CTerrorPlayer_TransitionRestore_Post);
 	Call_PushCell(pThis);
 	Call_PushCell(iReturn);
 	Call_Finish();

addons/sourcemod/scripting/l4dd/l4dd_forwards.sp

@@ -215,17 +215,16 @@ void SetupForwardsNatives()
 		g_hFWD_InfoChangelevel_SaveEntities									= new GlobalForward("L4D1_OnSavingEntities",							ET_Event, Param_Cell, Param_Cell);
 		g_hFWD_InfoChangelevel_SaveEntities_Post							= new GlobalForward("L4D1_OnSavingEntities_Post",						ET_Event, Param_Cell, Param_Cell);
 		g_hFWD_InfoChangelevel_SaveEntities_PostHandled						= new GlobalForward("L4D1_OnSavingEntities_PostHandled",				ET_Event, Param_Cell, Param_Cell);
+	}
 
+	if( g_bLeft4Dead2 )
+	{
 		g_hFWD_CTerrorPlayer_TransitionRestore								= new GlobalForward("L4D2_OnTransitionRestore",							ET_Event, Param_Cell);
 		g_hFWD_CTerrorPlayer_TransitionRestore_Post							= new GlobalForward("L4D2_OnTransitionRestore_Post",					ET_Event, Param_Cell, Param_Cell);
 		g_hFWD_CTerrorPlayer_TransitionRestore_PostHandled					= new GlobalForward("L4D2_OnTransitionRestore_PostHandled",				ET_Event, Param_Cell, Param_Cell);
 		g_hFWD_RestoreTransitionedSurvivorBots								= new GlobalForward("L4D2_OnRestoreTransitionedSurvivorBots",			ET_Event);
 		g_hFWD_RestoreTransitionedSurvivorBots_Post							= new GlobalForward("L4D2_OnRestoreTransitionedSurvivorBots_Post",		ET_Event);
 		g_hFWD_RestoreTransitionedSurvivorBots_PostHandled					= new GlobalForward("L4D2_OnRestoreTransitionedSurvivorBots_PostHandled",	ET_Event);
-	}
-
-	if( g_bLeft4Dead2 )
-	{
 		g_hFWD_CVomitJarProjectile_Create_Pre								= new GlobalForward("L4D2_VomitJarProjectile_Pre",						ET_Event, Param_Cell, Param_Array, Param_Array, Param_Array, Param_Array);
 		g_hFWD_CVomitJarProjectile_Create_Post								= new GlobalForward("L4D2_VomitJarProjectile_Post",						ET_Event, Param_Cell, Param_Cell, Param_Array, Param_Array, Param_Array, Param_Array);
 		g_hFWD_CVomitJarProjectile_Create_PostHandled						= new GlobalForward("L4D2_VomitJarProjectile_PostHandled",				ET_Event, Param_Cell, Param_Cell, Param_Array, Param_Array, Param_Array, Param_Array);

addons/sourcemod/scripting/l4dd/l4dd_setup.sp

@@ -1,14 +1,19 @@
-1.158 (21-Mar-2025)
-	- Added forwards "L4D2_OnTransitionRestore*" and "L4D2_OnRestoreTransitionedSurvivorBots*" to trigger on clients and bots transitioning data restore. Thanks to "blueblur0730" for adding.
-	- Fixed native "L4D2Direct_SetVSCampaignScore" not updating the scores fully. Thanks to "nikita1824" for reporting.
+1.159 (01-Jul-2025)
+	- Fixed forward "L4D_OnDeathDroppedWeapons" from throwing client not in game errors. Thanks to "Mystik Spiral" for reporting.
+	- Fixed forwards "L4D2_VomitJarProjectile_*" not working due to incorrect initialization. Thanks to "Drgon" and "ProjectSky" for reporting.
+	- Fixed gamedata signature for "CGrenadeLauncher_Projectile::Explode" forward on L4D2 Linux. Thanks to "xiaolinRM" for reporting.
+	- Clarification in the include file on how often the "L4D_OnSpawnTank*" forwards trigger. Thanks to "Marttt" for reporting.
 
 	- Updated: Plugin and test plugin.
 	- Updated: "/gamedata/left4dhooks.l4d2.txt" GameData file.
 	- Updated: "/scripting/l4dd/l4dd_forwards.sp" project file.
-	- Updated: "/scripting/l4dd/l4dd_natives.sp" project file.
 	- Updated: "/scripting/l4dd/l4dd_setup.sp" project file.
 	- Updated: "/scripting/include/left4dhooks.inc" include file.
 
+1.158 (21-Mar-2025)
+	- Added forwards "L4D2_OnTransitionRestore*" and "L4D2_OnRestoreTransitionedSurvivorBots*" to trigger on clients and bots transitioning data restore. Thanks to "blueblur0730" for adding.
+	- Fixed native "L4D2Direct_SetVSCampaignScore" not updating the scores fully. Thanks to "nikita1824" for reporting.
+
 1.157 (04-Jan-2025)
 	- Plugin is now compiled with SourceMod version 1.11 again.
 	- Changed the "L4D_SetPlayerIntensity" stock to a native, fixing the function from not working. Thanks to "Neburai" for providing the method.

addons/sourcemod/scripting/l4dd/left4dhooks_changelog.txt

@@ -18,8 +18,8 @@
 
 
 
-#define PLUGIN_VERSION		"1.158"
-#define PLUGIN_VERLONG		1158
+#define PLUGIN_VERSION		"1.159"
+#define PLUGIN_VERLONG		1159
 
 #define DEBUG				0
 // #define DEBUG			1	// Prints addresses + detour info (only use for debugging, slows server down).
@@ -29,6 +29,8 @@
 
 #define KILL_VSCRIPT		0	// 0=Keep VScript entity after using for "GetVScriptOutput". 1=Kill the entity after use (more resourceful to keep recreating, use if you're maxing out entities and reaching the limit regularly).
 
+#define ALLOW_UPDATER		0	// 0=Off. 1=Allow the plugin to auto-update using the "Updater" plugin by "GoD-Tony". 2=Allow updating and reloading after update.
+
 
 
 /*======================================================================================
@@ -111,6 +113,15 @@
 #include <dhooks>
 #include <left4dhooks>
 
+// ====================================================================================================
+// UPDATER
+#define UPDATE_URL						"https://raw.githubusercontent.com/SilvDev/Left4DHooks/main/sourcemod/updater.txt"
+
+native void Updater_AddPlugin(const char[] url);
+// ====================================================================================================
+
+
+
 // PROFILER
 #if DEBUG
 #include <profiler>
@@ -433,6 +444,14 @@ public APLRes AskPluginLoad2(Handle myself, bool late, char[] error, int err_max
 	g_hThisPlugin = myself;
 
 
+
+	// =================
+	// UPDATER
+	// =================
+	MarkNativeAsOptional("Updater_AddPlugin");
+
+
+
 	// =================
 	// DUPLICATE PLUGIN RUNNING
 	// =================
@@ -472,6 +491,32 @@ public APLRes AskPluginLoad2(Handle myself, bool late, char[] error, int err_max
 	return APLRes_Success;
 }
 
+
+
+// ====================================================================================================
+//									UPDATER
+// ====================================================================================================
+#if ALLOW_UPDATER
+public void OnLibraryAdded(const char[] name)
+{
+	if( strcmp(name, "updater") == 0 )
+	{
+		Updater_AddPlugin(UPDATE_URL);
+	}
+}
+#endif
+
+#if ALLOW_UPDATER == 2
+public void Updater_OnPluginUpdated()
+{
+	char filename[64];
+	GetPluginFilename(null, filename, sizeof(filename));
+	ServerCommand("sm plugins reload %s", filename);
+}
+#endif
+
+
+
 // ====================================================================================================
 //									SETUP
 // ====================================================================================================

addons/sourcemod/scripting/left4dhooks.sp

@@ -18,7 +18,7 @@
 
 
 
-#define PLUGIN_VERSION		"1.158"
+#define PLUGIN_VERSION		"1.159"
 
 /*=======================================================================================
 	Plugin Info:
@@ -5648,7 +5648,7 @@ public Action L4D2_OnTransitionRestore(int client)
 		if( called == 0 ) g_iForwards++;
 		called++;
 
-		ForwardCalled("\"L4D2_OnChangeFinaleStage\" client: %d (%N)", client, client);
+		ForwardCalled("\"L4D2_OnTransitionRestore\" client: %d (%N)", client, client);
 	}
 
 	// return Plugin_Handled;