merge from upstream

Author: KevonLin

addons/sourcemod/configs/matchmodes.txt

@@ -15,11 +15,11 @@
 		}
 		"zonemod"
 		{
-			"name" "ZoneMod 2.8.9e"
+			"name" "ZoneMod 2.9"
 		}
 		"zoneretro"
 		{
-			"name" "ZoneMod Retro 2.8.9e"
+			"name" "ZoneMod Retro 2.9"
 		}
 		"neomod"
 		{
@@ -51,7 +51,7 @@
 		}
 		"zonehunters"
 		{
-			"name" "ZoneHunters 2.8.9d"
+			"name" "ZoneHunters 2.9"
 		}
 	}
 	"3v3"

addons/sourcemod/extensions/l4d2_resolve_collision_fix.ext.2.l4d2.dll

@@ -3,7 +3,7 @@
 	"left4dead2"
 	{
 		"Offsets"
-		{	
+		{
 			"Infected::m_vecNeighbors"
 			{
 				"windows" "7468"
@@ -118,6 +118,30 @@
 				"linux"			"@_ZN11CBaseEntity15SetGroundEntityEPS_"
 				"windows"		"\x55\x8B\xEC\x53\x8B\xD9\x8B\x83\x44\x02\x00\x00"
 			}
+			
+			"ZombieBotLocomotion::OnAnimationActivityComplete"
+			{
+				"library"		"server"
+				"linux"			"@_ZN19ZombieBotLocomotion27OnAnimationActivityCompleteEi"
+				"windows"		"\x55\x8B\xEC\x83\xEC\x0C\x57\x8B\xF9\x83\xBF\xE8\x00\x00\x00\x00"
+			}
+			
+			"CBaseEntity::SetAbsVelocity" // https://github.com/Psykotikism/L4D1-2_Signatures
+			{
+				"library"	"server"
+				"linux"		"@_ZN11CBaseEntity14SetAbsVelocityERK6Vector"
+				"mac"		"@_ZN11CBaseEntity14SetAbsVelocityERK6Vector"
+				"windows"	"\x2A\x2A\x2A\x2A\x2A\x2A\x56\x8B\x2A\x2A\xF3\x2A\x2A\x2A\x57\x8B\x2A\x0F"
+						/* ? ? ? ? ? ? 56 8B ? ? F3 ? ? ? 57 8B ? 0F */
+			}
+			
+			"ZombieBotLocomotion::UpdatePosition"
+			{
+				"library"	"server"
+				"linux"		"@_ZN19ZombieBotLocomotion14UpdatePositionERK6Vector"
+				"windows"	"\x55\x8B\xEC\x83\xEC\x30\xA1\x2A\x2A\x2A\x2A\x53\x56\x57\x8B\xF9"
+						/* ? ? ? ? ? ? 56 8B ? ? F3 ? ? ? 57 8B ? 0F */
+			}
 		}
 	}
 }

addons/sourcemod/extensions/l4d2_resolve_collision_fix.ext.2.l4d2.so

@@ -125,14 +125,14 @@ public void OnPluginStart()
 	if (lateLoad) {
 		for (int i = 1; i <= MaxClients; i++) {
 			if (IsClientInGame(i)) {
-				OnClientPostAdminCheck(i);
+				OnClientPutInServer(i);
 			}
 		}
 	}
 }
 
 // Used to check for tank rocks and tank punches.
-public void OnClientPostAdminCheck(int client)
+public void OnClientPutInServer(int client)
 {
 	SDKHook(client, SDKHook_OnTakeDamage, OnTakeDamage);
 }

addons/sourcemod/gamedata/l4d2_resolve_collision.txt

@@ -41,7 +41,7 @@ public FS_ConVarChange(Handle:convar, const String:oldValue[], const String:newV
 	FS_bEnabled = GetConVarBool(FS_hEnabled);
 }
 
-public OnClientPostAdminCheck(client)
+public OnClientPutInServer(client)
 {
 	SDKHook(client, SDKHook_PreThinkPost, HookCallback);
 }