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

Fixed crash in city-state influence notification

Browse Source
This commit is contained in:
Yair Morgenstern
2020-01-30 19:17:12 +02:00
parent b29813b389
commit 375c39c61e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt
View File

@ -282,11 +282,12 @@ class DiplomacyManager() {
influence = min(restingPoint, influence + increment) influence = min(restingPoint, influence + increment)
else influence = restingPoint else influence = restingPoint
val civCapitalLocation = if(civInfo.cities.isNotEmpty()) civInfo.getCapital().location else null
if (getTurnsToRelationshipChange() == 1) if (getTurnsToRelationshipChange() == 1)
otherCiv().addNotification("Your relationship with [${civInfo.civName}] is about to degrade", civInfo.getCapital().location, Color.GOLD) otherCiv().addNotification("Your relationship with [${civInfo.civName}] is about to degrade", civCapitalLocation, Color.GOLD)
if (initialRelationshipLevel >= RelationshipLevel.Friend && initialRelationshipLevel != relationshipLevel()) if (initialRelationshipLevel >= RelationshipLevel.Friend && initialRelationshipLevel != relationshipLevel())
otherCiv().addNotification("Your relationship with [${civInfo.civName}] degraded", civInfo.getCapital().location, Color.GOLD) otherCiv().addNotification("Your relationship with [${civInfo.civName}] degraded", civCapitalLocation, Color.GOLD)
} }
private fun nextTurnFlags() { private fun nextTurnFlags() {