From 5392d3152eefb62bbd062c3f54f19cbf6632a8bb Mon Sep 17 00:00:00 2001
From: ineed bots <ineedbots@pbot.org>
Date: Tue, 19 Apr 2022 16:41:29 -0600
Subject: [PATCH] Air drop changes for chat

---
 userraw/maps/mp/bots/_bot.gsc        |  7 ++--
 userraw/maps/mp/bots/_bot_chat.gsc   | 59 +++++++++++++++-------------
 userraw/maps/mp/bots/_bot_script.gsc |  2 +-
 3 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/userraw/maps/mp/bots/_bot.gsc b/userraw/maps/mp/bots/_bot.gsc
index 7368b9f..2a95a49 100644
--- a/userraw/maps/mp/bots/_bot.gsc
+++ b/userraw/maps/mp/bots/_bot.gsc
@@ -366,9 +366,6 @@ addNotifyOnAirdrops_loop()
 	{
 		airdrop = dropCrates[i];
 
-		if ( !isDefined( airdrop.owner ) )
-			continue;
-
 		if ( isDefined( airdrop.doingPhysics ) )
 			continue;
 
@@ -398,7 +395,9 @@ doNotifyOnAirdrop()
 	self waittill( "physics_finished" );
 
 	self.doingPhysics = false;
-	self.owner notify( "crate_physics_done" );
+
+	if ( isDefined( self.owner ) )
+		self.owner notify( "crate_physics_done" );
 
 	self thread onCarepackageCaptured();
 }
diff --git a/userraw/maps/mp/bots/_bot_chat.gsc b/userraw/maps/mp/bots/_bot_chat.gsc
index e658f28..543ae09 100644
--- a/userraw/maps/mp/bots/_bot_chat.gsc
+++ b/userraw/maps/mp/bots/_bot_chat.gsc
@@ -170,6 +170,7 @@ start_killed_watch()
 start_chat_watch()
 {
 	self endon( "disconnect" );
+	level endon ( "game_ended" );
 
 	for ( ;; )
 	{
@@ -931,41 +932,37 @@ bot_chat_streak( streakCount )
 
 	if ( streakCount == 25 )
 	{
-		if ( GetDvarInt( "bots_loadout_allow_op" ) )
+		if ( self.pers["lastEarnedStreak"] == "nuke" )
 		{
-			if ( self.pers["lastEarnedStreak"] == "nuke" )
+			switch ( randomint( 5 ) )
 			{
-				switch ( randomint( 5 ) )
-				{
-					case 0:
-						self BotDoChat( 100, "I GOT A NUKE!!" );
-						break;
+				case 0:
+					self BotDoChat( 100, "I GOT A NUKE!!" );
+					break;
 
-					case 1:
-						self BotDoChat( 100, "NUKEEEEEEEEEEEEEEEEE" );
-						break;
+				case 1:
+					self BotDoChat( 100, "NUKEEEEEEEEEEEEEEEEE" );
+					break;
 
-					case 2:
-						self BotDoChat( 100, "25 killstreak!!!" );
-						break;
+				case 2:
+					self BotDoChat( 100, "25 killstreak!!!" );
+					break;
 
-					case 3:
-						self BotDoChat( 100, "NNNNNUUUUUUUUUUKKKKEEE!!! UWDHAWIDMIOGHE" );
-						break;
+				case 3:
+					self BotDoChat( 100, "NNNNNUUUUUUUUUUKKKKEEE!!! UWDHAWIDMIOGHE" );
+					break;
 
-					case 4:
-						self BotDoChat( 100, "You guys are getting nuuuuuuked~ x3" );
-						break;
-				}
-			}
-			else
-			{
-				self BotDoChat( 100, "Come on! I would of had a nuke but I don't got it set..." );
+				case 4:
+					self BotDoChat( 100, "You guys are getting nuuuuuuked~ x3" );
+					break;
 			}
 		}
 		else
 		{
-			self BotDoChat( 100, "WOW.. I could have a nuke but dumb admin disabled it for bots." );
+			if ( GetDvarInt( "bots_loadout_allow_op" ) )
+				self BotDoChat( 100, "Come on! I would of had a nuke but I don't got it set..." );
+			else
+				self BotDoChat( 100, "WOW.. I could have a nuke but dumb admin disabled it for bots." );
 		}
 	}
 }
@@ -977,6 +974,9 @@ bot_chat_killed_watch( victim )
 {
 	self endon( "disconnect" );
 
+	if ( !isDefined( victim ) || !isDefined( victim.name ) )
+		return;
+
 	message = "";
 
 	switch ( randomint( 42 ) )
@@ -1163,6 +1163,9 @@ bot_chat_death_watch( killer, last_ks )
 {
 	self endon( "disconnect" );
 
+	if ( !isDefined( killer ) || !isDefined( killer.name ) )
+		return;
+
 	message = "";
 
 	switch ( randomint( 68 ) )
@@ -1771,7 +1774,7 @@ bot_chat_crate_cap_watch( state, aircare, player, d, e, f, g )
 			switch ( randomint( 2 ) )
 			{
 				case 0:
-					if ( aircare.owner == self )
+					if ( !isDefined( aircare.owner ) || aircare.owner == self )
 						self BotDoChat( 5, "going to my carepackage" );
 					else
 						self BotDoChat( 5, "going to " + aircare.owner.name + "'s carepackage" );
@@ -1789,7 +1792,7 @@ bot_chat_crate_cap_watch( state, aircare, player, d, e, f, g )
 			switch ( randomint( 2 ) )
 			{
 				case 0:
-					if ( aircare.owner == self )
+					if ( !isDefined( aircare.owner ) || aircare.owner == self )
 						self BotDoChat( 15, "taking my carepackage" );
 					else
 						self BotDoChat( 15, "taking " + aircare.owner.name + "'s carepackage" );
@@ -1804,7 +1807,7 @@ bot_chat_crate_cap_watch( state, aircare, player, d, e, f, g )
 			break;
 
 		case "stop":
-			if ( aircare.owner == self )
+			if ( !isDefined( aircare.owner ) || aircare.owner == self )
 			{
 				switch ( randomint( 6 ) )
 				{
diff --git a/userraw/maps/mp/bots/_bot_script.gsc b/userraw/maps/mp/bots/_bot_script.gsc
index fe44c78..2a58fe6 100644
--- a/userraw/maps/mp/bots/_bot_script.gsc
+++ b/userraw/maps/mp/bots/_bot_script.gsc
@@ -3891,7 +3891,7 @@ bot_crate_think_loop( data )
 
 	waitTime = 3;
 
-	if ( isDefined( crate.owner ) && crate.owner == self )
+	if ( !isDefined( crate.owner ) || crate.owner == self )
 		waitTime = 0.5;
 
 	crate waittill_notify_or_timeout( "captured", waitTime );