mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-15 10:18:26 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crash when nuking Barbarian units

Browse Source
This commit is contained in:
Yair Morgenstern
2020-12-11 14:09:19 +02:00
parent 95423c125d
commit 1f59a4ea48
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.md
View File

@ -14,7 +14,6 @@ Selected unit stays selected when single-tap moved into a tile with another unit
By 9kgsofrice: By 9kgsofrice:
- resources can be added by tile improvement with unique "Provides [] []" - 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 - Specialists can add happiness
- "Should not be displayed without []" unique for constructions accomodates resources and buildings - "Should not be displayed without []" unique for constructions accomodates resources and buildings

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

@ -388,8 +388,8 @@ object Battle {
fun declareWar(civSuffered: CivilizationInfo) { fun declareWar(civSuffered: CivilizationInfo) {
if (civSuffered != attackingCiv if (civSuffered != attackingCiv
&& attackingCiv.knows(attackingCiv) && civSuffered.knows(attackingCiv)
&& attackingCiv.getDiplomacyManager(civSuffered).canDeclareWar()) { && civSuffered.getDiplomacyManager(attackingCiv).canDeclareWar()) {
civSuffered.getDiplomacyManager(attackingCiv).declareWar() civSuffered.getDiplomacyManager(attackingCiv).declareWar()
} }
} }

2
core/src/com/unciv/models/metadata/GameSettings.kt
View File

@ -12,7 +12,7 @@ class GameSettings {
var checkForDueUnits: Boolean = true var checkForDueUnits: Boolean = true
var singleTapMove: Boolean = false var singleTapMove: Boolean = false
var language: String = "English" 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<String>() var tutorialsShown = HashSet<String>()
var tutorialTasksCompleted = HashSet<String>() var tutorialTasksCompleted = HashSet<String>()
var hasCrashedRecently = false var hasCrashedRecently = false