Fix duplicate territory listed for amphib bombardment #12009
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Change Summary & Additional Notes
This would happen when there's both an air and a land battle at the territory.
The cause was this coding pattern:
Since
getPendingBattleSites()
would return battle sites for all (non-bombard) battles, it would list the same territory twice when that territory had both an air and a regular battle. But then, we'd retrieve the same NORMAL battle for that territory, processing it twice.The fix is to get rid of the above pattern (which was also inefficient) and instead add a
getPendingBattles(type)
API.Several other call sites are converted to the new pattern. It's possible they also exhibited related bugs.
The new pattern is also more efficient since it's no longer O(n^2) as the
getPendingBattle()
call is removed.This PR also cleans up a few other things, such as grammar in comments that IntelliJ warns about.
Fixes #11999.
Release Note
FIX|Duplicate naval bombard territory listed when there's an air battle