correct NPE in bvReports when player is not on a team

MegaMek · Sep 8, 2023 · 81a7688 · 81a7688
1 parent 5dc5bc9
commit 81a7688
Showing 1 changed file with 24 additions and 20 deletions.
diff --git a/megamek/src/megamek/server/GameManager.java b/megamek/src/megamek/server/GameManager.java
@@ -1682,26 +1682,30 @@ private void bvReports(boolean checkBlind) {
 
             playerReport.addAll(bvReport(player.getColorForPlayer(), player.getId(), bvcPlayer, checkBlind));
 
-            BVCountHelper bvcTeam = teamsInfo.get(player.getTeam());
-            bvcTeam.bv += bvcPlayer.bv;
-            bvcTeam.bvInitial += bvcPlayer.bvInitial;
-            bvcTeam.bvFled += bvcPlayer.bvFled;
-            bvcTeam.unitsCount += bvcPlayer.unitsCount;
-            bvcTeam.unitsInitialCount += bvcPlayer.unitsInitialCount;
-            bvcTeam.unitsLightDamageCount += bvcPlayer.unitsLightDamageCount;
-            bvcTeam.unitsModerateDamageCount += bvcPlayer.unitsModerateDamageCount;
-            bvcTeam.unitsHeavyDamageCount += bvcPlayer.unitsHeavyDamageCount;
-            bvcTeam.unitsCrippledCount += bvcPlayer.unitsCrippledCount;
-            bvcTeam.unitsDestroyedCount += bvcPlayer.unitsDestroyedCount;
-            bvcTeam.unitsCrewEjectedCount += bvcPlayer.unitsCrewEjectedCount;
-            bvcTeam.unitsCrewTrappedCount += bvcPlayer.unitsCrewTrappedCount;
-            bvcTeam.unitsCrewKilledCount += bvcPlayer.unitsCrewKilledCount;
-            bvcTeam.unitsFledCount += bvcPlayer.unitsFledCount;
-            bvcTeam.ejectedCrewActiveCount += bvcPlayer.ejectedCrewActiveCount;
-            bvcTeam.ejectedCrewPickedUpByTeamCount += bvcPlayer.ejectedCrewPickedUpByTeamCount;
-            bvcTeam.ejectedCrewPickedUpByEnemyTeamCount += bvcPlayer.ejectedCrewPickedUpByEnemyTeamCount;
-            bvcTeam.ejectedCrewKilledCount += bvcPlayer.ejectedCrewKilledCount;
-            bvcTeam.ejectedCrewFledCount += bvcPlayer.ejectedCrewFledCount;
+            int playerTeam = player.getTeam();
+
+            if (playerTeam != Player.TEAM_UNASSIGNED && playerTeam != Player.TEAM_NONE) {
+                BVCountHelper bvcTeam = teamsInfo.get(playerTeam);
+                bvcTeam.bv += bvcPlayer.bv;
+                bvcTeam.bvInitial += bvcPlayer.bvInitial;
+                bvcTeam.bvFled += bvcPlayer.bvFled;
+                bvcTeam.unitsCount += bvcPlayer.unitsCount;
+                bvcTeam.unitsInitialCount += bvcPlayer.unitsInitialCount;
+                bvcTeam.unitsLightDamageCount += bvcPlayer.unitsLightDamageCount;
+                bvcTeam.unitsModerateDamageCount += bvcPlayer.unitsModerateDamageCount;
+                bvcTeam.unitsHeavyDamageCount += bvcPlayer.unitsHeavyDamageCount;
+                bvcTeam.unitsCrippledCount += bvcPlayer.unitsCrippledCount;
+                bvcTeam.unitsDestroyedCount += bvcPlayer.unitsDestroyedCount;
+                bvcTeam.unitsCrewEjectedCount += bvcPlayer.unitsCrewEjectedCount;
+                bvcTeam.unitsCrewTrappedCount += bvcPlayer.unitsCrewTrappedCount;
+                bvcTeam.unitsCrewKilledCount += bvcPlayer.unitsCrewKilledCount;
+                bvcTeam.unitsFledCount += bvcPlayer.unitsFledCount;
+                bvcTeam.ejectedCrewActiveCount += bvcPlayer.ejectedCrewActiveCount;
+                bvcTeam.ejectedCrewPickedUpByTeamCount += bvcPlayer.ejectedCrewPickedUpByTeamCount;
+                bvcTeam.ejectedCrewPickedUpByEnemyTeamCount += bvcPlayer.ejectedCrewPickedUpByEnemyTeamCount;
+                bvcTeam.ejectedCrewKilledCount += bvcPlayer.ejectedCrewKilledCount;
+                bvcTeam.ejectedCrewFledCount += bvcPlayer.ejectedCrewFledCount;
+            }
         }
 
         // Show teams BVs