From: "Enrico Weigelt, metux IT consult" <enrico.weig...@gr13.net>
---
src/net/sf/freecol/server/model/DiplomacySession.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/net/sf/freecol/server/model/DiplomacySession.java
b/src/net/sf/freecol/server/model/DiplomacySession.java
index b36faac37a9..0bd2f1d19dd 100644
--- a/src/net/sf/freecol/server/model/DiplomacySession.java
+++ b/src/net/sf/freecol/server/model/DiplomacySession.java
@@ -19,7 +19,6 @@
package net.sf.freecol.server.model;
-import java.util.function.Predicate;
import java.util.logging.Logger;
import net.sf.freecol.common.model.DiplomaticTrade;
@@ -257,15 +256,19 @@ public class DiplomacySession extends TimedSession {
private static DiplomacySession findContactSession(Player p1, Player p2) {
final ServerPlayer s1 = (ServerPlayer)p1;
final ServerPlayer s2 = (ServerPlayer)p2;
- final Predicate<Session> pred = s -> (s instanceof DiplomacySession)
+
+ for (Session s : allSessions.values())
+ if ((s instanceof DiplomacySession)
&& ((DiplomacySession)s).getAgreement() != null
&& (((DiplomacySession)s).getAgreement().getContext()
== DiplomaticTrade.TradeContext.CONTACT)
&& ((((DiplomacySession)s).getOwner() == s1
&& ((DiplomacySession)s).getOtherPlayer() == s2)
|| (((DiplomacySession)s).getOwner() == s2
- && ((DiplomacySession)s).getOtherPlayer() == s1));
- return (DiplomacySession)find(allSessions.values(), pred);
+ && ((DiplomacySession)s).getOtherPlayer() == s1)))
+ return (DiplomacySession)s;
+
+ 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
Freecol-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/freecol-developers
