From: "Enrico Weigelt, metux IT consult" <enrico.weig...@gr13.net>
---
src/net/sf/freecol/client/control/InGameController.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/net/sf/freecol/client/control/InGameController.java
b/src/net/sf/freecol/client/control/InGameController.java
index 5bd020fa78e..1ec1857f4bb 100644
--- a/src/net/sf/freecol/client/control/InGameController.java
+++ b/src/net/sf/freecol/client/control/InGameController.java
@@ -1287,6 +1287,13 @@ public final class InGameController extends
FreeColClientHolder {
}
}
+ private List<ChoiceItem<Player>> getEnemyChoices(Player me) {
+ List<ChoiceItem<Player>> result = new ArrayList<>();
+ for (Player p : getGame().getLiveEuropeanPlayers(me))
+ result.add(new
ChoiceItem<Player>(Messages.message(p.getCountryLabel()), p));
+ return result;
+ }
+
/**
* Check the carrier for passengers to disembark, possibly
* snatching a useful result from the jaws of a
@@ -1779,8 +1786,8 @@ public final class InGameController extends
FreeColClientHolder {
Player enemy = getGUI().getChoice(unit.getTile(),
Messages.message("missionarySettlement.inciteQuestion"),
unit, "missionarySettlement.cancel",
- transform(getGame().getLiveEuropeanPlayers(player),
alwaysTrue(),
- p -> new
ChoiceItem<>(Messages.message(p.getCountryLabel()), p)));
+ getEnemyChoices(player));
+
if (enemy == null) return true;
askServer().incite(unit, is, enemy, -1);
break;
--
2.11.0.rc0.7.gbe5a750
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Freecol-developers mailing list
Freecol-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/freecol-developers
