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

Fixed an issue where mods with either the 'patronage' or 'entrepreneurschip' policy would crash upon taking it (#4192)

Browse Source
This commit is contained in:
Xander Lenstra 2021-06-19 20:41:52 +02:00 committed by GitHub
parent 3686366156
commit 8f26a77b2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/com/unciv/logic/civilization/PolicyManager.kt
View File

@ -57,11 +57,15 @@ class PolicyManager {
fun setTransients() {
// Reassign policies deprecated in 3.14.17, left for backwards compatibility
if (adoptedPolicies.contains("Patronage")) {
if (adoptedPolicies.contains("Patronage") &&
!civInfo.gameInfo.ruleSet.policies.contains("Patronage")
) {
adoptedPolicies.add("Merchant Navy")
adoptedPolicies.remove("Patronage")
}
if (adoptedPolicies.contains("Entrepreneurship")) {
if (adoptedPolicies.contains("Entrepreneurship") &&
!civInfo.gameInfo.ruleSet.policies.contains("Entrepreneurship")
) {
adoptedPolicies.add("Naval Tradition")
adoptedPolicies.remove("Entrepreneurship")
}