From 10273375839c572be7069b4385f2d1562ffa3a43 Mon Sep 17 00:00:00 2001 From: Jackz Date: Tue, 11 May 2021 15:58:13 -0500 Subject: [PATCH] popuation_control: Only increment common count on success --- plugins/l4d2_population_control.smx | Bin 5606 -> 5608 bytes scripting/l4d2_population_control.sp | 18 +++++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/l4d2_population_control.smx b/plugins/l4d2_population_control.smx index 0c1379597c7b8fbf1631417acb81ca4a82e89a7f..7a14b3d98c6f6be92a6effa5175b3a4f7002e08c 100644 GIT binary patch delta 5404 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 delta 5405 zcmWlbcRZDU6vywSdyTAYS4bgSxOTW!G9y{pWhQ%E`ysoVm6^nq z0Re%)K|gaH014 z>?I5O1t|!m1yl`?x6%**(hZu2AT}}($SY8-K(;^+o(FLSAp@)a`9P3cptl7z4kQxv ziJ+!|T$6)9Zh)ExA`bdH;KaqCw^N2dz?mVnAYPz<1ZoFJ59nvWfkq&tU{NX*x(ZPH zKI-$!trrrZ7j{k&$F=|MiD6}LDP>*^S9?Cj)ye$&rhu)≫lTskM&ig=!BLo=oWv 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 Ae*gdg diff --git a/scripting/l4d2_population_control.sp b/scripting/l4d2_population_control.sp index 0b9e060..8379ac3 100644 --- a/scripting/l4d2_population_control.sp +++ b/scripting/l4d2_population_control.sp @@ -110,14 +110,7 @@ public void CVAR_hTotalZombiesChanged(ConVar convar, const char[] oldValue, cons public void OnEntityCreated(int entity, const char[] classname) { if (StrEqual(classname, "infected") && IsDoneLoading) { - //If limiter turned on: - if(commonLimit != 0) { - if(iCurrentCommons > commonLimit) { - SDKHook(entity, SDKHook_SpawnPost, Hook_SpawnPost); - return; - } - } - ++iCurrentCommons; + SDKHook(entity, SDKHook_SpawnPost, Hook_SpawnPost); char m_ModelName[PLATFORM_MAX_PATH]; GetEntPropString(entity, Prop_Data, "m_ModelName", m_ModelName, sizeof(m_ModelName)); @@ -141,7 +134,14 @@ public void OnEntityCreated(int entity, const char[] classname) { } public Action Hook_SpawnPost(int entity) { - AcceptEntityInput(entity, "Kill"); + if(commonLimit != 0) { + if(iCurrentCommons >= commonLimit) { + AcceptEntityInput(entity, "Kill"); + return Plugin_Continue; + } + } + ++iCurrentCommons; + return Plugin_Continue; } public Action Event_InfectedDeath(Event event, const char[] name, bool dontBroadcast) {