From: "Enrico Weigelt, metux IT consult" <[email protected]>
---
src/net/sf/freecol/common/model/SettlementType.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/net/sf/freecol/common/model/SettlementType.java
b/src/net/sf/freecol/common/model/SettlementType.java
index 65e8adb2d0e..26a4778e7b6 100644
--- a/src/net/sf/freecol/common/model/SettlementType.java
+++ b/src/net/sf/freecol/common/model/SettlementType.java
@@ -216,9 +216,12 @@ public class SettlementType extends FreeColSpecObjectType {
* @return The plunder range, or null if none applicable.
*/
public final RandomRange getPlunderRange(Unit unit) {
- if (this.plunder == null) return null;
- PlunderType pt = find(plunder, p -> p.appliesTo(unit));
- return (pt == null) ? null : pt.getPlunder();
+ if (this.plunder != null)
+ for (PlunderType p : this.plunder)
+ if ((p != null) && p.appliesTo(unit))
+ return p.getPlunder();
+
+ 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
[email protected]
https://lists.sourceforge.net/lists/listinfo/freecol-developers
