Merge pull request #5936 from Sleet01/Fix_5903_NPE_when_switching_uni…

…ts_during_deployment Fix #5903 with a null check before dereferencing Coords cp
MegaMek · Aug 21, 2024 · c978b30 · c978b30
2 parents 56f5170 + 7e11fae
commit c978b30
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/megamek/src/megamek/client/ui/swing/boardview/BoardView.java b/megamek/src/megamek/client/ui/swing/boardview/BoardView.java
@@ -1124,6 +1124,9 @@ private synchronized void drawHexSpritesForHex(Coords c, Graphics g,
 
         for (HexSprite sprite : spriteArrayList) {
             Coords cp = sprite.getPosition();
+            if (cp == null) {
+                continue;
+            }
             // This can potentially be an expensive operation
             Rectangle spriteBounds = sprite.getBounds();
             if (cp.equals(c) && view.intersects(spriteBounds) && !sprite.isHidden()) {