mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-20 09:17:47 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed edge-case bug where a tile that a unit was headed towards becomes unreachable afterwards

Browse Source
This commit is contained in:
Yair Morgenstern 2018-06-19 19:33:26 +03:00
parent 5aef49955a
commit 7c26daaed2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/map/MapUnit.kt
View File

@ -43,7 +43,9 @@ class MapUnit {
if (action != null && action!!.startsWith("moveTo")) { if (action != null && action!!.startsWith("moveTo")) {
val destination = action!!.replace("moveTo ", "").split(",").dropLastWhile { it.isEmpty() }.toTypedArray() val destination = action!!.replace("moveTo ", "").split(",").dropLastWhile { it.isEmpty() }.toTypedArray()
val destinationVector = Vector2(Integer.parseInt(destination[0]).toFloat(), Integer.parseInt(destination[1]).toFloat()) val destinationVector = Vector2(Integer.parseInt(destination[0]).toFloat(), Integer.parseInt(destination[1]).toFloat())
val gotTo = movementAlgs().headTowards(currentTile.tileMap[destinationVector]) val destinationTile = currentTile.tileMap[destinationVector]
if(!movementAlgs().canReach(destinationTile)) return // That tile that we were moving towards is now unreachable
val gotTo = movementAlgs().headTowards(destinationTile)
if(gotTo==currentTile) // We didn't move at all if(gotTo==currentTile) // We didn't move at all
return return
if (gotTo.position == destinationVector) action = null if (gotTo.position == destinationVector) action = null