Fix Commander Lottery Bug

- Fixes bug in commander lottery system where subsequent rounds (after the first) would not correctly promote commanders
data-bomb · Feb 13, 2024 · 6902009 · 6902009
1 parent 0211c82
commit 6902009
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/Si_CommManagement/Si_CmdrMgr.cs b/Si_CommManagement/Si_CmdrMgr.cs
@@ -40,7 +40,7 @@ You should have received a copy of the GNU General Public License
 using SilicaAdminMod;
 using System.Linq;
 
-[assembly: MelonInfo(typeof(CommanderManager), "Commander Management", "1.4.4", "databomb", "https://github.com/data-bomb/Silica")]
+[assembly: MelonInfo(typeof(CommanderManager), "Commander Management", "1.4.5", "databomb", "https://github.com/data-bomb/Silica")]
 [assembly: MelonGame("Bohemia Interactive", "Silica")]
 [assembly: MelonOptionalDependencies("Admin Mod")]
 
@@ -319,7 +319,7 @@ public static void Postfix(MusicJukeboxHandler __instance, GameMode __0)
 
                     for (int i = 0; i < MaxTeams; i++)
                     {
-                        if (commanderApplicants[i].Count == 0)
+                        if (Team.Teams[i] == null || commanderApplicants[i].Count == 0)
                         {
                             continue;
                         }
@@ -352,6 +352,10 @@ public static void Postfix(MusicJukeboxHandler __instance, GameMode __0)
                             previousCommanders.Add(CommanderPlayer);
                             commanderApplicants[i].RemoveAt(iCommanderIndex);
                         }
+                        else
+                        {
+                            MelonLogger.Warning("Can't find lottery winner. Not promoting for team " + Team.Teams[i].TeamName);
+                        }
 
                         // switch remaining players to infantry
                         foreach (Player infantryPlayer in commanderApplicants[i])
@@ -364,6 +368,10 @@ public static void Postfix(MusicJukeboxHandler __instance, GameMode __0)
                             MelonLogger.Msg("Player " + infantryPlayer.PlayerName + " lost commander lottery. Spawning as infantry.");
                             GameMode.CurrentGameMode.SpawnUnitForPlayer(infantryPlayer, infantryPlayer.Team);
                         }
+
+                        // everyone is promoted or moved to infantry, clear for the next round
+                        commanderApplicants[i].Clear();
+                        MelonLogger.Msg("Clearing commander lottery for team " + Team.Teams[i].TeamName);
                     }
                 }
                 catch (Exception error)