From 67a2f71022d9732d26742a349b2982c53e9b918f Mon Sep 17 00:00:00 2001
From: Pinsplash <39359267+Pinsplash@users.noreply.github.com>
Date: Tue, 18 Jul 2023 11:53:44 -0500
Subject: [PATCH] fixed infinite loop in PickEffect

---
 sp/src/game/server/hl2/hl2_player.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/sp/src/game/server/hl2/hl2_player.cpp b/sp/src/game/server/hl2/hl2_player.cpp
index 1994b571..557667e3 100644
--- a/sp/src/game/server/hl2/hl2_player.cpp
+++ b/sp/src/game/server/hl2/hl2_player.cpp
@@ -5300,7 +5300,7 @@ int CHL2_Player::PickEffect(int iWeightSum, bool bTest)
 	}
 
 	//list of effects we've already checked availability for. false means unchecked, true means checked and unpickable.
-	//if an effect is found to be pickable, then we would instantly return it instead, not tracked in this list because it'd be pointless, though it could be useful to in the future.
+	//this does not track effects that are pickable but not chosen by the RNG, but in the future this should be done for optimization.
 	bool bEffectStatus[NUM_EFFECTS] = { true };//(Error) should never be picked
 	int iUnpickableAmt = 1;
 
@@ -5333,7 +5333,7 @@ int CHL2_Player::PickEffect(int iWeightSum, bool bTest)
 			if (bEffectStatus[i] == false)
 			{
 				bool bGoodActiveness = !EffectOrGroupAlreadyActive(candEffect->m_nID);
-				bool bGoodContext;
+				bool bGoodContext = false;
 				//check activeness and context
 				if (bGoodActiveness)
 				{
@@ -5358,8 +5358,11 @@ int CHL2_Player::PickEffect(int iWeightSum, bool bTest)
 				{
 					if (chaos_print_rng.GetBool()) Msg("Bad activeness for i %i %s\n", i, STRING(g_ChaosEffects[i]->m_strGeneralName), nRememberRandom);
 				}
-				iUnpickableAmt++;
-				bEffectStatus[i] = true;
+				if (!bGoodActiveness || !bGoodContext)
+				{
+					iUnpickableAmt++;
+					bEffectStatus[i] = true;
+				}
 			}
 			if (nRandom <= g_ChaosEffects[i]->m_iCurrentWeight)
 			{