Skip to content

Commit

Permalink
Merge pull request #5836 from SJuliez/turn-1
Browse files Browse the repository at this point in the history
GameReports: remove error message and deal with missing rounds
  • Loading branch information
HammerGS authored Aug 1, 2024
2 parents 7b33c02 + 12a525f commit 07835e7
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions megamek/src/megamek/common/GameReports.java
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,13 @@ public boolean hasReportsforRound(int round) {

@Override
public List<Report> get(int round) {
if (round == 0) {
// Round 0 (deployment) reports are lumped in with round one.
round = 1;
}
// Rounds prior to 1 (initial deployment) are lumped in with round 1
round = Math.max(1, round);
if (hasReportsforRound(round)) {
return reports.get(round - 1);
} else {
return new ArrayList<>();
}

LogManager.getLogger().error("GameReports.get() was asked for reports of round {} which it does not have",
round, new RuntimeException());
return null;
}

/**
Expand Down

0 comments on commit 07835e7

Please sign in to comment.