Skip to content

Commit

Permalink
Merge pull request #12655 from riverwanderer/12645-Respect-localisati…
Browse files Browse the repository at this point in the history
…on-when-filtering-sides

12645 Respect localisation when filtering sides
  • Loading branch information
uckelman authored Sep 12, 2023
2 parents 59feff7 + 77b373a commit 0699599
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ public Component getControls() {
final ArrayList<String> alreadyTaken = new ArrayList<>();

for (final PlayerInfo p : players) {
alreadyTaken.add(p.side);
alreadyTaken.add(p.getLocalizedSide());
}

availableSides.removeAll(alreadyTaken);
Expand Down Expand Up @@ -749,7 +749,7 @@ public List<String> getAvailableSides() {
final ArrayList<String> alreadyTaken = new ArrayList<>();

for (final PlayerInfo p : players) {
alreadyTaken.add(p.side);
alreadyTaken.add(p.getLocalizedSide());
}

availableSides.removeAll(alreadyTaken);
Expand All @@ -761,7 +761,7 @@ protected String promptForSide() {
final ArrayList<String> alreadyTaken = new ArrayList<>();

for (final PlayerInfo p : players) {
alreadyTaken.add(p.side);
alreadyTaken.add(p.getLocalizedSide());
}

availableSides.removeAll(alreadyTaken);
Expand Down

0 comments on commit 0699599

Please sign in to comment.