AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 22:37:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug where even if the unit couldn't be placed within 3 tiles it was still added to the civ's unit list

Browse Source
This commit is contained in:
Yair Morgenstern 2018-08-25 23:14:20 +03:00
parent 9fbb997e63
commit ce00fd43e0
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/com/unciv/logic/map/TileMap.kt
View File

@ -60,10 +60,15 @@ class TileMap {
fun placeUnitNearTile(position: Vector2, unitName: String, civInfo: CivilizationInfo): MapUnit { fun placeUnitNearTile(position: Vector2, unitName: String, civInfo: CivilizationInfo): MapUnit {
val unit = GameBasics.Units[unitName]!!.getMapUnit() val unit = GameBasics.Units[unitName]!!.getMapUnit()
unit.assignOwner(civInfo)
val tilesInDistance = getTilesInDistance(position, 2) val tilesInDistance = getTilesInDistance(position, 2)
unit.owner=civInfo.civName // needed in order to calculate canMoveTo
val unitToPlaceTile = tilesInDistance.firstOrNull { unit.canMoveTo(it) } val unitToPlaceTile = tilesInDistance.firstOrNull { unit.canMoveTo(it) }
if(unitToPlaceTile!=null) unit.putInTile(unitToPlaceTile) if(unitToPlaceTile!=null) {
unit.putInTile(unitToPlaceTile)
unit.assignOwner(civInfo) // only once we know the unit can be placed do we add it to the civ's unit list
}
return unit return unit
} }