Merge pull request #4854 from kuronekochomusuke/issue4850

check getEntityFromAllSources, since this processes entities that in a…
MegaMek · Oct 26, 2023 · 1c6cbfe · 1c6cbfe
2 parents ff8a855 + 78b8554
commit 1c6cbfe
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/megamek/src/megamek/client/Client.java b/megamek/src/megamek/client/Client.java
@@ -1258,18 +1258,24 @@ public String receiveReport(Vector<Report> v) {
             }
 
             if (entityID != -1 && crewID != -1) {
-                Entity e = game.getEntity(entityID);
-                Crew crew = e.getCrew();
-                // Adjust the portrait size to the GUI scale and number of pilots
-                float imgSize = UIUtil.scaleForGUI(PilotToolTip.PORTRAIT_BASESIZE);
-                imgSize /= 0.2f * (crew.getSlotCount() - 1) + 1;
-                Image portrait = crew.getPortrait(crewID).getBaseImage().getScaledInstance(-1, (int) imgSize, Image.SCALE_SMOOTH);
-                // convert image to base64, add to the <img> tag and store in cache
-                BufferedImage bufferedImage = new BufferedImage(portrait.getWidth(null), portrait.getHeight(null), BufferedImage.TYPE_INT_RGB);
-                bufferedImage.getGraphics().drawImage(portrait, 0, 0, null);
-                String base64Text = ImageUtil.base64TextEncodeImage(bufferedImage);
-                String img = "<img src='data:image/png;base64," + base64Text + "'>";
-                updatedReport = updatedReport.replace("<span crew='" + entityID + ":" + crewID + "'></span>", img);
+                Entity e = game.getEntityFromAllSources(entityID);
+
+                if (e != null) {
+                    Crew crew = e.getCrew();
+
+                    if (crew != null) {
+                        // Adjust the portrait size to the GUI scale and number of pilots
+                        float imgSize = UIUtil.scaleForGUI(PilotToolTip.PORTRAIT_BASESIZE);
+                        imgSize /= 0.2f * (crew.getSlotCount() - 1) + 1;
+                        Image portrait = crew.getPortrait(crewID).getBaseImage().getScaledInstance(-1, (int) imgSize, Image.SCALE_SMOOTH);
+                        // convert image to base64, add to the <img> tag and store in cache
+                        BufferedImage bufferedImage = new BufferedImage(portrait.getWidth(null), portrait.getHeight(null), BufferedImage.TYPE_INT_RGB);
+                        bufferedImage.getGraphics().drawImage(portrait, 0, 0, null);
+                        String base64Text = ImageUtil.base64TextEncodeImage(bufferedImage);
+                        String img = "<img src='data:image/png;base64," + base64Text + "'>";
+                        updatedReport = updatedReport.replace("<span crew='" + entityID + ":" + crewID + "'></span>", img);
+                    }
+                }
             }
         }