From 1f59a4ea4831a9f0afbfb55054d1061b22b0f27d Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Fri, 11 Dec 2020 14:09:19 +0200 Subject: [PATCH] Fixed crash when nuking Barbarian units --- changelog.md | 1 - core/src/com/unciv/logic/battle/Battle.kt | 4 ++-- core/src/com/unciv/models/metadata/GameSettings.kt | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/changelog.md b/changelog.md index 216a609b45..db0292f0f0 100644 --- a/changelog.md +++ b/changelog.md @@ -14,7 +14,6 @@ Selected unit stays selected when single-tap moved into a tile with another unit By 9kgsofrice: - resources can be added by tile improvement with unique "Provides [] []" -- wonder text will not be displayed & "[] enabled:" will not show if nothing visible in list - Specialists can add happiness - "Should not be displayed without []" unique for constructions accomodates resources and buildings diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index 87e28d556e..64da63a24d 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -388,8 +388,8 @@ object Battle { fun declareWar(civSuffered: CivilizationInfo) { if (civSuffered != attackingCiv - && attackingCiv.knows(attackingCiv) - && attackingCiv.getDiplomacyManager(civSuffered).canDeclareWar()) { + && civSuffered.knows(attackingCiv) + && civSuffered.getDiplomacyManager(attackingCiv).canDeclareWar()) { civSuffered.getDiplomacyManager(attackingCiv).declareWar() } } diff --git a/core/src/com/unciv/models/metadata/GameSettings.kt b/core/src/com/unciv/models/metadata/GameSettings.kt index 3472af59f1..7901e0d4e9 100644 --- a/core/src/com/unciv/models/metadata/GameSettings.kt +++ b/core/src/com/unciv/models/metadata/GameSettings.kt @@ -12,7 +12,7 @@ class GameSettings { var checkForDueUnits: Boolean = true var singleTapMove: Boolean = false var language: String = "English" - var resolution: String = "900x600" // Aut-detecting resolution was a BAD IDEA since it needs to be based on DPI AND resolution. + var resolution: String = "900x600" // Auto-detecting resolution was a BAD IDEA since it needs to be based on DPI AND resolution. var tutorialsShown = HashSet() var tutorialTasksCompleted = HashSet() var hasCrashedRecently = false