Merge pull request #5774 from IllianiCBT/5760

Fixed Combat Team Status Logic for Convoy and Support Forces
MegaMek · Jan 15, 2025 · 69988a1 · 69988a1
2 parents 778679b + e365218
commit 69988a1
Showing 1 changed file with 9 additions and 0 deletions.
diff --git 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);