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

When capturing Civilian, stop current action (#6542)

Browse Source 
* On captureCivilianUnit, stop current action

* Remove excess import

Co-authored-by: itanasi <spellman23@gmail.com>
This commit is contained in:
itanasi 2022-04-15 06:23:00 -07:00 committed by GitHub
parent 94e8264d36
commit 0e8a22a1e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -522,6 +522,8 @@ object Battle {
val defenderCiv = defender.getCivInfo() val defenderCiv = defender.getCivInfo()
val capturedUnit = defender.unit val capturedUnit = defender.unit
// Stop current action
capturedUnit.action = null
val capturedUnitTile = capturedUnit.getTile() val capturedUnitTile = capturedUnit.getTile()
val originalOwner = if (capturedUnit.originalOwner != null) val originalOwner = if (capturedUnit.originalOwner != null)