From e36521805940573350c4c3755dee01ff813f7034 Mon Sep 17 00:00:00 2001
From: IllianiCBT <danielfarbrace@icloud.com>
Date: Sun, 12 Jan 2025 22:46:15 -0600
Subject: [PATCH] Fix combat team status logic for convoy and non-combat forces

Adjusted validations to prevent assigning combat team status to convoy forces and non-combat forces. This ensures more accurate handling of force classifications within the campaign.
---
 MekHQ/src/mekhq/campaign/force/CombatTeam.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/MekHQ/src/mekhq/campaign/force/CombatTeam.java b/MekHQ/src/mekhq/campaign/force/CombatTeam.java
index f2da4f28d9..d1dd6a608f 100644
--- a/MekHQ/src/mekhq/campaign/force/CombatTeam.java
+++ b/MekHQ/src/mekhq/campaign/force/CombatTeam.java
@@ -371,6 +371,15 @@ size > getStandardForceSize(campaign.getFaction()) + 2) {
                 force.setCombatTeamStatus(false);
                 return false;
             }
+
+            if (parentForce.isConvoyForce()) {
+                force.setCombatTeamStatus(false);
+                return false;
+            }
+
+            if (!parentForce.isCombatForce()) {
+                return false;
+            }
         }
 
         force.setCombatTeamStatus(true);