From 11fc28ad3abd02aa680113851a117c3f419f7a09 Mon Sep 17 00:00:00 2001
From: Druss99 <42724070+Druss99@users.noreply.github.com>
Date: Sun, 19 Oct 2025 21:40:40 -0400
Subject: [PATCH] fix bugs wrt divert airfields for opfor (#595)

---
 changelog.md                                                | 1 +
 qt_ui/windows/mission/flight/QFlightCreator.py              | 4 ++--
 .../mission/flight/settings/FlightPlanPropertiesGroup.py    | 6 +++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/changelog.md b/changelog.md
index cee916e4..9ecb7fcd 100644
--- a/changelog.md
+++ b/changelog.md
@@ -27,6 +27,7 @@
 * **[Campaign]** Fixed a bug where sinking a destroyer in a carrier group would cause squadrons to be removed from the carrier
 * **[Engine]** Fixed a bug with transfers to Helipads
 * **[Engine]** Fixed a bug with parking allocation
+* **[Flight Plans]** Fixed a bug where divert airfield was broken for opfor
 
 # Retribution v1.4.1 (hotfix)
 
diff --git a/qt_ui/windows/mission/flight/QFlightCreator.py b/qt_ui/windows/mission/flight/QFlightCreator.py
index ec4354c0..ed900ba0 100644
--- a/qt_ui/windows/mission/flight/QFlightCreator.py
+++ b/qt_ui/windows/mission/flight/QFlightCreator.py
@@ -81,7 +81,7 @@ class QFlightCreator(QDialog):
             [
                 cp
                 for cp in game.theater.controlpoints
-                if cp.captured.is_blue == is_ownfor
+                if cp.captured.is_blue == is_ownfor and not cp.captured.is_neutral
             ],
             self.aircraft_selector.currentData(),
             "None",
@@ -178,7 +178,7 @@ class QFlightCreator(QDialog):
             return "You must select an aircraft type."
         if squadron is None:
             return "You must select a squadron."
-        if divert is not None and not divert.captured:
+        if divert is not None and divert.captured != squadron.player:
             return f"{divert.name} is not owned by your coalition."
         available = squadron.untasked_aircraft
         if not available:
diff --git a/qt_ui/windows/mission/flight/settings/FlightPlanPropertiesGroup.py b/qt_ui/windows/mission/flight/settings/FlightPlanPropertiesGroup.py
index d95e1f94..254a1ded 100644
--- a/qt_ui/windows/mission/flight/settings/FlightPlanPropertiesGroup.py
+++ b/qt_ui/windows/mission/flight/settings/FlightPlanPropertiesGroup.py
@@ -84,7 +84,11 @@ class FlightPlanPropertiesGroup(QGroupBox):
         layout.addLayout(QLabeledWidget("Arrival:", arrival_label))
 
         self.divert = QArrivalAirfieldSelector(
-            [cp for cp in game.theater.controlpoints if cp.captured.is_blue],
+            [
+                cp
+                for cp in game.theater.controlpoints
+                if cp.captured == flight.coalition.player
+            ],
             flight.unit_type,
             "None",
         )