When cities expand, units that aren't allowed to enter there are pushed to the closest moveable tile

core/src/com/unciv/logic/city/CityExpansionManager.kt

@@ -43,6 +43,9 @@ class CityExpansionManager {
             cityInfo.tiles.remove(tileInfo.position)
 
         cityInfo.tiles.add(tileInfo.position)
+        for(unit in tileInfo.getUnits())
+            if(!unit.civInfo.canEnterTiles(cityInfo.civInfo))
+                unit.movementAlgs().teleportToClosestMoveableTile()
     }
 
     fun getNewTile(): TileInfo? {

core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt

@@ -1,7 +1,6 @@
 package com.unciv.logic.map
 
 import com.badlogic.gdx.math.Vector2
-import com.unciv.models.gamebasics.unit.UnitType
 
 class UnitMovementAlgorithms(val unit:MapUnit) {
     val tileMap = unit.getTile().tileMap
@@ -185,9 +184,7 @@ class UnitMovementAlgorithms(val unit:MapUnit) {
                     .firstOrNull{unit.canMoveTo(it)}
         }
         unit.removeFromTile() // we "teleport" them away
-        if(unit.getBaseUnit().unitType==UnitType.Civilian)
-            allowedTile.civilianUnit=unit
-        else allowedTile.militaryUnit=unit
+        unit.putInTile(allowedTile)
     }
 
 }