From bd4bdc06f4179907bc6bf294dc8d87768a05acd2 Mon Sep 17 00:00:00 2001
From: Resxt <55228336+Resxt@users.noreply.github.com>
Date: Thu, 10 Mar 2022 13:03:54 +0100
Subject: [PATCH] automatic_weapons_rewards 1.0.1

Fix not being able to use killstreaks
---
 .../automatic_weapons_rewards.gsc             | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/custom_killstreaks_rewards/automatic_weapons_rewards.gsc b/custom_killstreaks_rewards/automatic_weapons_rewards.gsc
index c86c9e3..9df27b4 100644
--- a/custom_killstreaks_rewards/automatic_weapons_rewards.gsc
+++ b/custom_killstreaks_rewards/automatic_weapons_rewards.gsc
@@ -187,23 +187,32 @@ WeaponReward()
 	{
 		while(true)
 		{
-			CheckWeaponReward(level.weapon_rewards);
+			CheckWeaponReward(level.weapon_rewards, spawn_weapon);
 			wait 0.01;
 		}
 	}
 }
 
-CheckWeaponReward(weapon_rewards)
+CheckWeaponReward(weapon_rewards, spawn_weapon)
 {
 	player_kills = self.pers["kills"];
 
 	for (i = 0; i < weapon_rewards.size; i++)
 	{
-		next_reward = weapon_rewards[i][1];
-		if (player_kills >= weapon_rewards[i][0] && player_kills < weapon_rewards[i+1][0] && self GetCurrentWeapon() != next_reward)
+		if (player_kills >= weapon_rewards[i][0] && player_kills < weapon_rewards[i+1][0])
 		{
-			ReplaceWeapon(next_reward);
-			break;
+			if (self GetCurrentWeapon() == spawn_weapon)
+			{
+				self.pers["weapons_reward_tier"] = weapon_rewards[i][0];
+				ReplaceWeapon(weapon_rewards[i][1]);
+				break;
+			}
+			else if (i > 0 && self GetCurrentWeapon() == weapon_rewards[i-1][1])
+			{
+				self.pers["weapons_reward_tier"] = weapon_rewards[i][0];
+				ReplaceWeapon(weapon_rewards[i][1]);
+				break;
+			}
 		}
 	}
 }