Index: source/simulation2/components/CCmpTerritoryManager.cpp =================================================================== --- source/simulation2/components/CCmpTerritoryManager.cpp +++ source/simulation2/components/CCmpTerritoryManager.cpp @@ -581,11 +581,16 @@ u8 CCmpTerritoryManager::GetTerritoryPercentage(player_id_t player) { - if (player <= 0 || (size_t)player > m_TerritoryCellCounts.size()) + if (player <= 0 || static_cast(player) >= m_TerritoryCellCounts.size()) return 0; CalculateTerritories(); + // We just recalculated territories for all players + // so check player is still there + if (static_cast(player) >= m_TerritoryCellCounts.size()) + return 0; + if (m_TerritoryTotalPassableCellCount == 0) return 0;