Skip to content

Fix IndexOutOfBoundsException starting a game on a one-coast map #166

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.

Sign up for GitHub

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

Open
KevinGriffin-new wants to merge 1 commit into
base: sf-auto-merge
Choose a base branch
from
Open

Fix IndexOutOfBoundsException starting a game on a one-coast map #166

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions src/net/sf/freecol/server/generator/EuropeanStartingPositionsGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,10 +310,18 @@ private java.util.Map<Player, Tile> determineStartingTilesWithoutUsingPredetermi
switch (positionType) {
case GameOptions.STARTING_POSITIONS_CLASSIC:
// Classic mode respects coast preference, the lists
// are pre-sampled and shuffled
start = ((startAtSea)
// are pre-sampled and shuffled. On maps with sea on
// only one edge the preferred coast list can be empty;
// fall back to the other coast rather than crash.
List<Tile> preferred = (startAtSea)
? ((startEast) ? eastSeaTiles : westSeaTiles)
: ((startEast) ? eastLandTiles : westLandTiles)).remove(0);
: ((startEast) ? eastLandTiles : westLandTiles);
if (preferred.isEmpty()) {
preferred = (startAtSea)
? ((startEast) ? westSeaTiles : eastSeaTiles)
: ((startEast) ? westLandTiles : eastLandTiles);
}
start = preferred.remove(0);
break;
case GameOptions.STARTING_POSITIONS_RANDOM:
// Random mode is as classic but ignores coast
Expand Down