Fix null pointer crash in Community Patch only

LoneGazebo · Jul 10, 2024 · fa5568e · fa5568e
1 parent bfa6e19
commit fa5568e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CvGameCoreDLL_Expansion2/CvDiplomacyAI.cpp b/CvGameCoreDLL_Expansion2/CvDiplomacyAI.cpp
@@ -18434,7 +18434,7 @@ void CvDiplomacyAI::SelectBestApproachTowardsMajorCiv(PlayerTypes ePlayer, bool
 							}
 						}
 					}
-					else
+					else if (pReligion)
 					{
 						eController = pReligion->m_eFounder;
 					}
@@ -47809,6 +47809,7 @@ int CvDiplomacyAI::GetReligionScore(PlayerTypes ePlayer)
 			// Someone else's?
 			else
 			{
+				// Who controls the Holy City?
 				PlayerTypes eController = NO_PLAYER;
 				const CvReligion* pReligion = GC.getGame().GetGameReligions()->GetReligion(eTheirStateReligion, NO_PLAYER);
 				if (MOD_BALANCE_VP)
@@ -47822,7 +47823,7 @@ int CvDiplomacyAI::GetReligionScore(PlayerTypes ePlayer)
 						}
 					}
 				}
-				else
+				else if (pReligion)
 				{
 					eController = pReligion->m_eFounder;
 				}

diff --git a/CvGameCoreDLL_Expansion2/CvReligionClasses.cpp b/CvGameCoreDLL_Expansion2/CvReligionClasses.cpp
@@ -11721,7 +11721,7 @@ bool CvReligionAIHelpers::PassesTeammateReligionCheck(ReligionTypes eReligion, P
 			}
 		}
 	}
-	else
+	else if (pReligion)
 	{
 		eController = pReligion->m_eFounder;
 	}
-Original file line number
+Diff line change
@@ Expand Up @@
     			}
     		}
     	}
-    	else
+    	else if (pReligion)
     	{
     		eController = pReligion->m_eFounder;
     	}
@@ Expand Down @@