From 0a79afb1663403d908e763809234c478f164cb7e Mon Sep 17 00:00:00 2001
From: INeedBots <ineedbots@outlook.com>
Date: Sun, 29 Nov 2020 17:49:28 -0600
Subject: [PATCH] fix revive

---
 main_shared/maps/mp/bots/_bot_internal.gsc | 4 ++++
 main_shared/maps/mp/bots/_bot_script.gsc   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/main_shared/maps/mp/bots/_bot_internal.gsc b/main_shared/maps/mp/bots/_bot_internal.gsc
index e5f7bdb..b3baea2 100644
--- a/main_shared/maps/mp/bots/_bot_internal.gsc
+++ b/main_shared/maps/mp/bots/_bot_internal.gsc
@@ -308,6 +308,10 @@ onLastStand()
 
 		while (self inLastStand())
 			wait 0.05;
+
+		waittillframeend;
+		if (isDefined(self.previousPrimary) && self.previousPrimary != "none")
+			self changeToWeap(self.previousPrimary);
 	}
 }
 
diff --git a/main_shared/maps/mp/bots/_bot_script.gsc b/main_shared/maps/mp/bots/_bot_script.gsc
index 44cf5d6..733e2a1 100644
--- a/main_shared/maps/mp/bots/_bot_script.gsc
+++ b/main_shared/maps/mp/bots/_bot_script.gsc
@@ -1517,6 +1517,8 @@ bot_revive_think()
 		if (!isDefined(revivePlayer))
 			continue;
 
+		self.bot_lock_goal = true;
+
 		self SetScriptGoal( revivePlayer.origin, 1 );
 		self thread bot_inc_bots(revivePlayer.revivetrigger, true);
 		self thread bot_go_revive(revivePlayer);
@@ -1528,6 +1530,7 @@ bot_revive_think()
 		
 		if(event != "goal" || (isDefined(revivePlayer.currentlyBeingRevived) && revivePlayer.currentlyBeingRevived) || !self isTouching(revivePlayer.revivetrigger) || self InLastStand() || self HasThreat())
 		{
+			self.bot_lock_goal = false;
 			continue;
 		}
 		
@@ -1536,6 +1539,7 @@ bot_revive_think()
 		self bot_use_revive_thread(revivePlayer);
 		wait 1;
 		self ClearScriptGoal();
+		self.bot_lock_goal = false;
 	}
 }