From 80a808532bca66e7372203bc1ba04ebc457a9a1d Mon Sep 17 00:00:00 2001
From: kuronekochomusuke <kuronekochomusuke@gmail.com>
Date: Wed, 14 Jun 2023 16:03:33 -0400
Subject: [PATCH] exclude picked up pilots

---
 megamek/src/megamek/server/GameManager.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/megamek/src/megamek/server/GameManager.java b/megamek/src/megamek/server/GameManager.java
index 89a4286da74..168fee9aef4 100644
--- a/megamek/src/megamek/server/GameManager.java
+++ b/megamek/src/megamek/server/GameManager.java
@@ -1781,7 +1781,9 @@ private List<Report> bvReport(String name, int playerID, BVCountHelper bvc, bool
 
     private void entityStatusReport() {
         List<Report> reports = new ArrayList<>();
-        List<Entity> entities = game.getEntitiesVector().stream().filter(e -> e.isDeployed()).collect(Collectors.toList());
+        List<Entity> entities = game.getEntitiesVector().stream()
+                .filter(e -> (e.isDeployed() && !((e instanceof MechWarrior) && ((MechWarrior) e).getPickedUpById() != Entity.NONE)))
+                .collect(Collectors.toList());
         Comparator<Entity> comp = Comparator.comparing((Entity e) -> e.getOwner().getTeam());
         comp = comp.thenComparing((Entity e) -> e.getOwner().getName());
         comp = comp.thenComparing((Entity e) -> e.getDisplayName());