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

Fix crash when melee unit captures civilian then tries to attack it (#7282)

Browse Source
This commit is contained in:
OptimizedForDensity
2022-06-24 08:05:49 -04:00
committed by GitHub
parent 51caf7a4ed
commit 50a8ff3ce0
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,6 +58,10 @@ object Battle {
* but the hidden tile is actually IMPASSIBLE so you stop halfway! * but the hidden tile is actually IMPASSIBLE so you stop halfway!
*/ */
if (attacker.getTile() != attackableTile.tileToAttackFrom) return false if (attacker.getTile() != attackableTile.tileToAttackFrom) return false
/** Rarely, a melee unit will target a civilian then move through the civilian to get
* to attackableTile.tileToAttackFrom, meaning that they take the civilian. This check stops
* the melee unit from trying to capture their own unit if this happens */
if (getMapCombatantOfTile(attackableTile.tileToAttack)!!.getCivInfo() == attacker.getCivInfo()) return false
/** Alternatively, maybe we DID reach that tile, but it turned out to be a hill or something, /** Alternatively, maybe we DID reach that tile, but it turned out to be a hill or something,
* so we expended all of our movement points! * so we expended all of our movement points!
*/ */