From: "Enrico Weigelt, metux IT consult" <enrico.weig...@gr13.net>
---
src/net/sf/freecol/common/model/Unit.java | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/net/sf/freecol/common/model/Unit.java
b/src/net/sf/freecol/common/model/Unit.java
index ee066fffa0f..41a21952375 100644
--- a/src/net/sf/freecol/common/model/Unit.java
+++ b/src/net/sf/freecol/common/model/Unit.java
@@ -3699,21 +3699,18 @@ public class Unit extends GoodsLocation
Set<Modifier> result = new HashSet<>();
// UnitType modifiers always apply
- result.addAll(transform(unitType.getModifiers(id, fcgot, turn),
- alwaysTrue(),
- m -> m.setModifierIndex((m.getType() ==
Modifier.ModifierType.ADDITIVE)
+ for (Modifier m : unitType.getModifiers(id, fcgot, turn))
+ result.add(m.setModifierIndex((m.getType() ==
Modifier.ModifierType.ADDITIVE)
? Modifier.UNIT_ADDITIVE_COMBAT_INDEX
- : Modifier.UNIT_NORMAL_COMBAT_INDEX)));
+ : Modifier.UNIT_NORMAL_COMBAT_INDEX));
// The player's modifiers may not all apply
- result.addAll(transform(owner.getModifiers(id, fcgot, turn),
- alwaysTrue(),
- m -> m.setModifierIndex(Modifier.GENERAL_COMBAT_INDEX)));
+ for (Modifier m : owner.getModifiers(id, fcgot, turn))
+ result.add(m.setModifierIndex(Modifier.GENERAL_COMBAT_INDEX));
// Role modifiers apply
- result.addAll(transform(role.getModifiers(id, fcgot, turn),
- alwaysTrue(),
- m -> m.setModifierIndex(Modifier.ROLE_COMBAT_INDEX)));
+ for (Modifier m : role.getModifiers(id, fcgot, turn))
+ result.add(m.setModifierIndex(Modifier.ROLE_COMBAT_INDEX));
return result;
}
--
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
