mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-06 08:21:36 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a rare bug where unit would try to "walk" to a conquered city even though it was already in it

Browse Source
This commit is contained in:
Yair Morgenstern
2018-06-09 22:59:23 +03:00
parent 088583bd9d
commit b31e7ccc3d
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/battle/Battle.kt
View File

@ -164,7 +164,7 @@ class Battle(val gameInfo:GameInfo=UnCivGame.Current.gameInfo) {
conquerCity((defender as CityCombatant).city, attacker) conquerCity((defender as CityCombatant).city, attacker)
} }
if (attacker.isMelee() && (defender.isDefeated() || defender.getCivilization()==attacker.getCivilization() )) { else if (attacker.isMelee() && (defender.isDefeated() || defender.getCivilization()==attacker.getCivilization() )) {
if(attackedTile.civilianUnit!=null) if(attackedTile.civilianUnit!=null)
captureCivilianUnit(attacker,MapUnitCombatant(attackedTile.civilianUnit!!)) captureCivilianUnit(attacker,MapUnitCombatant(attackedTile.civilianUnit!!))
(attacker as MapUnitCombatant).unit.moveToTile(attackedTile) (attacker as MapUnitCombatant).unit.moveToTile(attackedTile)

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

@ -90,6 +90,7 @@ class MapUnit {
} }
fun moveToTile(otherTile: TileInfo) { fun moveToTile(otherTile: TileInfo) {
if(otherTile==getTile()) return // already here!
val distanceToTiles = getDistanceToTiles() val distanceToTiles = getDistanceToTiles()
if (!distanceToTiles.containsKey(otherTile)) if (!distanceToTiles.containsKey(otherTile))
throw Exception("You can't get there from here!") throw Exception("You can't get there from here!")