From 25f60af7646c1ffdccb8bfb4468afd8075362490 Mon Sep 17 00:00:00 2001
From: Nab <22328803+NABN00B@users.noreply.github.com>
Date: Sat, 24 Jul 2021 11:22:59 +0200
Subject: [PATCH 1/2] Prevent Catalina's heli from despawning

---
 src/vehicles/Heli.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/vehicles/Heli.cpp b/src/vehicles/Heli.cpp
index 6e302e01..a97ced78 100644
--- a/src/vehicles/Heli.cpp
+++ b/src/vehicles/Heli.cpp
@@ -986,7 +986,11 @@ CHeli::UpdateHelis(void)
 
 	// Remove all helis if in a tunnel or under water
 	if(FindPlayerCoors().z < - 2.0f)
+#ifdef FIX_BUGS
+		for(i = 0; i < HELI_CATALINA; i++)
+#else
 		for(i = 0; i < NUM_HELIS; i++)
+#endif
 			if(pHelis[i] && pHelis[i]->m_heliStatus != HELI_STATUS_SHOT_DOWN)
 				pHelis[i]->m_heliStatus = HELI_STATUS_FLY_AWAY;
 }

From 22e4d13163523856dab001fa2bc9e5217a40be5f Mon Sep 17 00:00:00 2001
From: Nab <22328803+NABN00B@users.noreply.github.com>
Date: Sun, 8 Aug 2021 11:55:37 +0200
Subject: [PATCH 2/2] Prevent Catalina's heli from despawning #2

---
 src/vehicles/Heli.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/vehicles/Heli.cpp b/src/vehicles/Heli.cpp
index a97ced78..0edb221b 100644
--- a/src/vehicles/Heli.cpp
+++ b/src/vehicles/Heli.cpp
@@ -986,10 +986,9 @@ CHeli::UpdateHelis(void)
 
 	// Remove all helis if in a tunnel or under water
 	if(FindPlayerCoors().z < - 2.0f)
-#ifdef FIX_BUGS
-		for(i = 0; i < HELI_CATALINA; i++)
-#else
 		for(i = 0; i < NUM_HELIS; i++)
+#ifdef FIX_BUGS
+			if(i == HELI_CATALINA) continue;
 #endif
 			if(pHelis[i] && pHelis[i]->m_heliStatus != HELI_STATUS_SHOT_DOWN)
 				pHelis[i]->m_heliStatus = HELI_STATUS_FLY_AWAY;