Merge branch 'master' into issue-6359-lam-mode-issues

MegaMek · Jan 20, 2025 · e9f65b6 · e9f65b6
2 parents 6c5dc39 + 9724539
commit e9f65b6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/megamek/docs/history.txt b/megamek/docs/history.txt
@@ -31,7 +31,7 @@ MEGAMEK VERSION HISTORY:
 + PR #6414: Warnings on Campaign Load - MegaMek Portion 
 + Fix #6412: Fix TacOps "Standing Still" modifier description
 + Fix 6373: Fixed "unit that starts and ends a Movement Phase in liquid magma takes an additional damage" so it doesn't apply to units above the magma
-
++ PR #6427 & #6428: Fix for Princess not ignoring Hidden and Ignored units. - Scoppio
 
 0.50.02 (2024-12-30 2130 UTC)
 + PR #6183: New GM Commands, princess commands on map menu, graphics for some explosions

diff --git a/megamek/src/megamek/client/bot/BotClient.java b/megamek/src/megamek/client/bot/BotClient.java
@@ -363,9 +363,9 @@ public List<Entity> getEnemyEntities() {
             currentTurnEnemyEntities = new ArrayList<>();
             for (Entity entity : game.getEntitiesVector()) {
                 if (entity.getOwner().isEnemyOf(getLocalPlayer())
-                        && (entity.getPosition() != null) && !entity.isOffBoard()
-                        && (entity.getCrew() != null) && !entity.getCrew().isDead()) {
-
+                    && (entity.getPosition() != null) && !entity.isOffBoard()
+                    && (entity.getCrew() != null) && !entity.getCrew().isDead()
+                    && !entity.isHidden()) {
                     currentTurnEnemyEntities.add(entity);
                 }
             }