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

If the selected unit was a civilian unit of ours that was captured, it is no longer selected.

Browse Source
This commit is contained in:
Yair Morgenstern 2018-06-13 13:27:59 +03:00
parent 0eb28ab679
commit 0468adc130
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt
View File

@ -38,11 +38,18 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){
if(selectedUnit!=null) if(selectedUnit!=null)
{ {
try{ selectedUnit!!.getTile()} if(selectedUnit!!.civInfo != worldScreen.civInfo) { // The unit that was selected, was captured. It exists but is no longer ours.
catch(ex:Exception) { selectedUnit = null
selectedUnit=null; currentlyExecutingAction = null
currentlyExecutingAction=null }
} // The unit that was there no longer exists} else {
try {
selectedUnit!!.getTile()
} catch (ex: Exception) { // The unit that was there no longer exists}
selectedUnit = null
currentlyExecutingAction = null
}
}
} }
if(selectedUnit!=null) { if(selectedUnit!=null) {