From a94a3f9d2e7c7a499370bced546a1572f94d2b3e Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Wed, 13 Nov 2019 21:45:54 +0200 Subject: [PATCH] Resolved #1323 - invalid trades should now be removed when turn starts --- core/src/com/unciv/logic/civilization/CivilizationInfo.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt index 3cfe044d52..4c7dc926c6 100644 --- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt +++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt @@ -359,7 +359,7 @@ class CivilizationInfo { for(tradeRequest in tradeRequests.toList()) { // remove trade requests where one of the sides can no longer supply val offeringCiv = gameInfo.getCivilization(tradeRequest.requestingCiv) - if (offeringCiv.isDefeated() || !TradeEvaluation().isTradeValid(tradeRequest.trade,this, offeringCiv)) { + if (offeringCiv.isDefeated() || !TradeEvaluation().isTradeValid(tradeRequest.trade,offeringCiv,this)) { tradeRequests.remove(tradeRequest) offeringCiv.addNotification("Our proposed trade is no longer relevant!", Color.GOLD) }