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

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

diff --git a/src/net/sf/freecol/common/model/UnitChangeType.java 
b/src/net/sf/freecol/common/model/UnitChangeType.java
index d65b501358c..0c5e3ce8449 100644
--- a/src/net/sf/freecol/common/model/UnitChangeType.java
+++ b/src/net/sf/freecol/common/model/UnitChangeType.java
@@ -223,8 +223,11 @@ public class UnitChangeType extends FreeColSpecObjectType {
      *     change is impossible.
      */
     public UnitChange getUnitChange(UnitType fromType, final UnitType toType) {
-        return find(getUnitChanges(fromType),
-            ((toType == null) ? alwaysTrue() : uc -> uc.to == toType));
+        for (UnitChange uc : getUnitChanges(fromType))
+            if (toType == null || uc.to == toType)
+                return uc;
+
+        return null;
     }
 
     // @compat 0.11.6
-- 
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