From 3204c22f16cf7b9724949f6805525513a5ddafe3 Mon Sep 17 00:00:00 2001
From: INeedBots <ineedbots@outlook.com>
Date: Fri, 19 Mar 2021 14:49:19 -0600
Subject: [PATCH] Fix sentry weapon, and reload cancel edge case

---
 userraw/maps/mp/bots/_bot_script.gsc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/userraw/maps/mp/bots/_bot_script.gsc b/userraw/maps/mp/bots/_bot_script.gsc
index 49235e6..32f11ac 100644
--- a/userraw/maps/mp/bots/_bot_script.gsc
+++ b/userraw/maps/mp/bots/_bot_script.gsc
@@ -3671,7 +3671,7 @@ doReloadCancel()
 
 		curWeap = self GetCurrentWeapon();
 		// check single reloads
-		if (self GetCurrentWeaponClipAmmo() < WeaponClipSize(curWeap))
+		if (self GetWeaponAmmoClip(curWeap) < WeaponClipSize(curWeap))
 			continue;
 
 		// check difficulty
@@ -3679,7 +3679,7 @@ doReloadCancel()
 			continue;
 
 		// check if got another weapon
-		weaponslist = self getweaponslistall();
+		weaponslist = self GetWeaponsListPrimaries();
 		weap = "";
 		while(weaponslist.size)
 		{
@@ -3976,6 +3976,8 @@ bot_killstreak_think()
 	self endon("death");
 	level endon("game_ended");
 
+	self thread maps\mp\killstreaks\_killstreaks::giveKillstreak( "sentry", false, false, self );
+
 	doFastContinue = false;
 
 	for (;;)
@@ -4083,6 +4085,7 @@ bot_killstreak_think()
 				self notify("place_sentry");
 				wait 0.05;
 				self notify("cancel_sentry");
+				wait 0.5;
 
 				self thread changeToWeapon(curWeap);