Fix another coop war assert hit

LoneGazebo · Dec 10, 2024 · 99db854 · 99db854
1 parent 0f909da
commit 99db854
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/CvGameCoreDLL_Expansion2/CvDiplomacyAI.cpp b/CvGameCoreDLL_Expansion2/CvDiplomacyAI.cpp
@@ -42032,6 +42032,7 @@ void CvDiplomacyAI::CancelAllCoopWars()
 	for (int iPlayerLoop = 0; iPlayerLoop < MAX_MAJOR_CIVS; iPlayerLoop++)
 	{
 		PlayerTypes eLoopPlayer = (PlayerTypes) iPlayerLoop;
+		TeamTypes eLoopTeam = GET_PLAYER(eLoopPlayer).getTeam();
 		if (!GET_PLAYER(eLoopPlayer).isAlive() || eLoopPlayer == GetID())
 			continue;
 
@@ -42041,7 +42042,8 @@ void CvDiplomacyAI::CancelAllCoopWars()
 		for (int iThirdPartyLoop = 0; iThirdPartyLoop < MAX_MAJOR_CIVS; iThirdPartyLoop++)
 		{
 			PlayerTypes eThirdParty = (PlayerTypes) iThirdPartyLoop;
-			if (GET_PLAYER(eThirdParty).getTeam() == GetTeam())
+			TeamTypes eThirdPartyTeam = GET_PLAYER(eThirdParty).getTeam();
+			if (eThirdPartyTeam == GetTeam() || eThirdPartyTeam == eLoopTeam)
 				continue;
 
 			if (pNotify && !bNotified && GetCoopWarState(eLoopPlayer, eThirdParty) == COOP_WAR_STATE_PREPARING)