From: "Enrico Weigelt, metux IT consult" <[email protected]>
---
src/net/sf/freecol/server/ai/REFAIPlayer.java | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/net/sf/freecol/server/ai/REFAIPlayer.java
b/src/net/sf/freecol/server/ai/REFAIPlayer.java
index 956c0319aa1..52e781af4e2 100644
--- a/src/net/sf/freecol/server/ai/REFAIPlayer.java
+++ b/src/net/sf/freecol/server/ai/REFAIPlayer.java
@@ -269,8 +269,13 @@ public class REFAIPlayer extends EuropeanAIPlayer {
final Random aiRandom = getAIRandom();
// Find a representative offensive land unit to use to search
// for the initial target.
- AIUnit aiUnit = find(getAIUnits(), aiu -> !aiu.getUnit().isNaval()
- && aiu.getUnit().isOffensiveUnit());
+ AIUnit aiUnit = null;
+ for (AIUnit aiu : getAIUnits())
+ if (!aiu.getUnit().isNaval() && aiu.getUnit().isOffensiveUnit()) {
+ aiUnit = aiu;
+ break;
+ }
+
if (aiUnit == null) {
logger.warning("REF has no army?!?");
return false;
@@ -746,10 +751,13 @@ public class REFAIPlayer extends EuropeanAIPlayer {
AIUnit found = null;
Colony target = null;
for (AIUnit aiCarrier : aiCarriers) {
- found = first(transform(aiCarrier.getUnit().getUnits(),
- u ->
u.hasAbility(Ability.REF_UNIT),
- u -> getAIUnit(u),
- toListNoNulls()));
+ for (Unit u : aiCarrier.getUnit().getUnits()) {
+ if (u.hasAbility(Ability.REF_UNIT))
+ found = getAIUnit(u);
+ if (found != null)
+ break;
+ }
+
if (found != null
&& (m = found.getMission()) != null
&& m.isValid()
--
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/freecol-developers
