Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GameReports: remove error message and deal with missing rounds #5836

Merged
merged 1 commit into from
Aug 1, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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