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

Fixed a crash when killing a barbarian invading an unmet city-state (#5396)

Browse Source
This commit is contained in:
Xander Lenstra 2021-10-04 16:18:06 +02:00 committed by GitHub
parent e1b4c53573
commit ec036dc3dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 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

@ -157,7 +157,7 @@ object Battle {
// CS friendship from killing barbarians // CS friendship from killing barbarians
if (defeatedUnit.matchesCategory("Barbarian") && defeatedUnit.matchesCategory("Military") && civUnit.getCivInfo().isMajorCiv()) { if (defeatedUnit.matchesCategory("Barbarian") && defeatedUnit.matchesCategory("Military") && civUnit.getCivInfo().isMajorCiv()) {
for (cityState in UncivGame.Current.gameInfo.getAliveCityStates()) { for (cityState in UncivGame.Current.gameInfo.getAliveCityStates()) {
if (defeatedUnit.unit.threatensCiv(cityState)) { if (civUnit.getCivInfo().knows(cityState) && defeatedUnit.unit.threatensCiv(cityState)) {
cityState.threateningBarbarianKilledBy(civUnit.getCivInfo()) cityState.threateningBarbarianKilledBy(civUnit.getCivInfo())
} }
} }