From 07b4dcd8baa3dfeeab2bc7722390633d0aa89c8f Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Thu, 23 Apr 2020 19:53:06 +0300 Subject: [PATCH] Fixed #2492 - trading cities with units in them no longer crashes the game --- core/src/com/unciv/logic/trade/TradeLogic.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/trade/TradeLogic.kt b/core/src/com/unciv/logic/trade/TradeLogic.kt index 4d396c4706..5aa7d7622f 100644 --- a/core/src/com/unciv/logic/trade/TradeLogic.kt +++ b/core/src/com/unciv/logic/trade/TradeLogic.kt @@ -97,7 +97,7 @@ class TradeLogic(val ourCivilization:CivilizationInfo, val otherCivilization: Ci if (offer.type == TradeType.City) { val city = from.cities.first { it.id == offer.name } city.moveToCiv(to) - city.getCenterTile().getUnits().forEach { it.movement.teleportToClosestMoveableTile() } + city.getCenterTile().getUnits().toList().forEach { it.movement.teleportToClosestMoveableTile() } to.updateViewableTiles() from.updateViewableTiles() }