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

---
 src/net/sf/freecol/common/model/Settlement.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/net/sf/freecol/common/model/Settlement.java 
b/src/net/sf/freecol/common/model/Settlement.java
index 3e17e75cd45..c4371da780d 100644
--- a/src/net/sf/freecol/common/model/Settlement.java
+++ b/src/net/sf/freecol/common/model/Settlement.java
@@ -433,8 +433,11 @@ public abstract class Settlement extends GoodsLocation
 
         // To succeed, there must exist an available role for the unit
         // where the extra equipment for the role is present.
-        return find(unit.getAvailableRoles(military),
-                    r -> canProvideGoods(unit.getGoodsDifference(r, 1)));
+        for (Role r : unit.getAvailableRoles(military))
+            if (canProvideGoods(unit.getGoodsDifference(r, 1)))
+                return r;
+
+        return null;
     }
 
     /**
-- 
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