mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-15 18:28:42 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #1323 - invalid trades should now be removed when turn starts

Browse Source
This commit is contained in:
Yair Morgenstern
2019-11-13 21:45:54 +02:00
parent 1abc649d59
commit a94a3f9d2e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View File

@ -359,7 +359,7 @@ class CivilizationInfo {
for(tradeRequest in tradeRequests.toList()) { // remove trade requests where one of the sides can no longer supply for(tradeRequest in tradeRequests.toList()) { // remove trade requests where one of the sides can no longer supply
val offeringCiv = gameInfo.getCivilization(tradeRequest.requestingCiv) 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) tradeRequests.remove(tradeRequest)
offeringCiv.addNotification("Our proposed trade is no longer relevant!", Color.GOLD) offeringCiv.addNotification("Our proposed trade is no longer relevant!", Color.GOLD)
} }