From: "Enrico Weigelt, metux IT consult" <enrico.weig...@gr13.net>

---
 src/net/sf/freecol/server/ai/EuropeanAIPlayer.java | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java 
b/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java
index 123b68280cc..7877c97cf73 100644
--- a/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java
+++ b/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java
@@ -824,13 +824,18 @@ public class EuropeanAIPlayer extends MissionAIPlayer {
      * @return The tile with the best plan for a colony, or null if none found.
      */
     public Tile getBestPlanTile(Colony colony) {
-        final Comparator<TileImprovementPlan> valueComp
-            = Comparator.comparingInt(TileImprovementPlan::getValue);
-        final Function<Tile, TileImprovementPlan> tileMapper = t ->
-            tipMap.get(t);
-        TileImprovementPlan best
-            = maximize(map(colony.getOwnedTiles(), tileMapper),
-                       isNotNull(), valueComp);
+        TileImprovementPlan best = null;
+        int best_v = 0;
+        for (Tile t : colony.getOwnedTiles()) {
+            TileImprovementPlan tip = tipMap.get(t);
+            if (tip == null) continue;
+            int v = tip.getValue();
+            if (best == null || v > best_v) {
+                best = tip;
+                best_v = v;
+            }
+        }
+
         return (best == null) ? null : best.getTarget();
     }
 
-- 
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

Reply via email to