From: "Enrico Weigelt, metux IT consult" <enrico.weig...@gr13.net>
---
src/net/sf/freecol/common/model/EquipmentType.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/net/sf/freecol/common/model/EquipmentType.java
b/src/net/sf/freecol/common/model/EquipmentType.java
index 09136a237d3..a56dedaed4a 100644
--- a/src/net/sf/freecol/common/model/EquipmentType.java
+++ b/src/net/sf/freecol/common/model/EquipmentType.java
@@ -22,7 +22,6 @@ package net.sf.freecol.common.model;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.function.Predicate;
import javax.xml.stream.XMLStreamException;
@@ -277,9 +276,12 @@ public class EquipmentType extends BuildableType {
super.readChildren(xr);
- final Predicate<Modifier> militaryPred = m ->
- Modifier.OFFENCE.equals(m.getId()) ||
Modifier.DEFENCE.equals(m.getId());
- militaryEquipment = any(getModifiers(), militaryPred);
+ for (Modifier m : getModifiers()) {
+ if (Modifier.OFFENCE.equals(m.getId()) ||
Modifier.DEFENCE.equals(m.getId())) {
+ militaryEquipment = true;
+ 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
