From 41f9fbfed2dc5ee7d63668c3ab8673f141c3ff9e Mon Sep 17 00:00:00 2001
From: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Date: Thu, 22 Jul 2021 18:42:08 +0200
Subject: [PATCH] Fixed comodification errors under certain circumstances
 (#4599)

---
 core/src/com/unciv/logic/trade/TradeLogic.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/com/unciv/logic/trade/TradeLogic.kt b/core/src/com/unciv/logic/trade/TradeLogic.kt
index b71ad1cfdb..29d9860c8e 100644
--- a/core/src/com/unciv/logic/trade/TradeLogic.kt
+++ b/core/src/com/unciv/logic/trade/TradeLogic.kt
@@ -89,8 +89,8 @@ class TradeLogic(val ourCivilization:CivilizationInfo, val otherCivilization: Ci
                     val city = from.cities.first { it.id == offer.name }
                     city.moveToCiv(to)
                     city.getCenterTile().getUnits().forEach { it.movement.teleportToClosestMoveableTile() }
-                    city.getTiles().forEach{ tile ->
-                        tile.getUnits().forEach{ unit ->
+                    for (tile in city.getTiles()) {
+                        for (unit in tile.getUnits().toList()) {
                             if (!unit.civInfo.canEnterTiles(to)) {
                                 unit.movement.teleportToClosestMoveableTile()
                             }