From 8f26a77b2d0dd44002f0b944711001752d9d9ee0 Mon Sep 17 00:00:00 2001
From: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Date: Sat, 19 Jun 2021 20:41:52 +0200
Subject: [PATCH] Fixed an issue where mods with either the 'patronage' or
 'entrepreneurschip' policy would crash upon taking it (#4192)

---
 core/src/com/unciv/logic/civilization/PolicyManager.kt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/src/com/unciv/logic/civilization/PolicyManager.kt b/core/src/com/unciv/logic/civilization/PolicyManager.kt
index 9d324c187e..a780cb8f3e 100644
--- a/core/src/com/unciv/logic/civilization/PolicyManager.kt
+++ b/core/src/com/unciv/logic/civilization/PolicyManager.kt
@@ -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")
             }