AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-24 03:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed 'move to tile' when selecting tile outside of current movement range (#11947)

Browse Source
This commit is contained in:
Yair Morgenstern 2024-07-11 21:28:44 +03:00 committed by GitHub
parent c0c76ad618
commit af4782ec08
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/ui/screens/worldscreen/WorldMapHolder.kt
View File

@ -282,10 +282,10 @@ class WorldMapHolder(
// Since this runs in a different thread, even if we check movement.canReach() // Since this runs in a different thread, even if we check movement.canReach()
// then it might change until we get to the getTileToMoveTo, so we just try/catch it // then it might change until we get to the getTileToMoveTo, so we just try/catch it
val tileToMoveTo: Tile val tileToMoveTo: Tile
val pathToTile: List<Tile> val pathToTile: List<Tile>?
try { try {
tileToMoveTo = selectedUnit.movement.getTileToMoveToThisTurn(targetTile) tileToMoveTo = selectedUnit.movement.getTileToMoveToThisTurn(targetTile)
pathToTile = selectedUnit.movement.getDistanceToTiles().getPathToTile(targetTile) pathToTile = selectedUnit.movement.getDistanceToTiles().getPathToTile(tileToMoveTo)
} catch (ex: Exception) { } catch (ex: Exception) {
when (ex) { when (ex) {
is UnitMovement.UnreachableDestinationException -> { is UnitMovement.UnreachableDestinationException -> {
@ -320,7 +320,7 @@ class WorldMapHolder(
worldScreen.shouldUpdate = true worldScreen.shouldUpdate = true
animateMovement(previousTile, selectedUnit, targetTile, pathToTile) animateMovement(previousTile, selectedUnit, tileToMoveTo, pathToTile)
if (selectedUnits.size > 1) { // We have more tiles to move if (selectedUnits.size > 1) { // We have more tiles to move
moveUnitToTargetTile(selectedUnits.subList(1, selectedUnits.size), targetTile) moveUnitToTargetTile(selectedUnits.subList(1, selectedUnits.size), targetTile)