make sure CanSelectForBattle is false for attackers who cannot join defense

Licho1 · Licho1 · commit d4371a88dd2a · 2026-04-29T12:16:50.000+02:00
diff --git a/ZkLobbyServer/SpringieInterface/PlanetWarsMatchMaker.cs b/ZkLobbyServer/SpringieInterface/PlanetWarsMatchMaker.cs
@@ -928,6 +928,10 @@ private PwMatchCommand StampLobbyCommand(LobbySnapshot snapshot, PwPhase phase,
                 }
                 else // DefendCollect
                 {
+                    // attack/defend are mutually exclusive across the whole cycle (see JoinPlanetDefense),
+                    // so any squad's attacker list disqualifies this player from defending ANY squad.
+                    var playerIsAttackerAnywhere = playerName != null && snapshot.Options.Any(o => o.AttackerNames.Contains(playerName));
+
                     var options = snapshot.Options.Select(s =>
                     {
                         var playerIsAttacker = playerName != null && s.AttackerNames.Contains(playerName);
@@ -942,7 +946,7 @@ private PwMatchCommand StampLobbyCommand(LobbySnapshot snapshot, PwPhase phase,
                             PlanetImage = s.PlanetImage,
                             Count = s.Count,
                             Needed = s.Needed,
-                            CanSelectForBattle = canDefend && !playerIsAttacker,
+                            CanSelectForBattle = canDefend && !playerIsAttackerAnywhere,
                             PlayerIsAttacker = playerIsAttacker,
                             PlayerIsDefender = playerName != null && s.DefenderNames.Contains(playerName),
                             AttackerFaction = s.AttackerFactionShortcut,

Original file line number	Diff line number	Diff line change
`@@ -928,6 +928,10 @@ private PwMatchCommand StampLobbyCommand(LobbySnapshot snapshot, PwPhase phase,`
`928`	`928`	`}`
`929`	`929`	`else // DefendCollect`
`930`	`930`	`{`
	`931`	`+ // attack/defend are mutually exclusive across the whole cycle (see JoinPlanetDefense),`
	`932`	`+ // so any squad's attacker list disqualifies this player from defending ANY squad.`
	`933`	`+ var playerIsAttackerAnywhere = playerName != null && snapshot.Options.Any(o => o.AttackerNames.Contains(playerName));`
	`934`	`+`
`931`	`935`	`var options = snapshot.Options.Select(s =>`
`932`	`936`	`{`
`933`	`937`	`var playerIsAttacker = playerName != null && s.AttackerNames.Contains(playerName);`
`@@ -942,7 +946,7 @@ private PwMatchCommand StampLobbyCommand(LobbySnapshot snapshot, PwPhase phase,`
`942`	`946`	`PlanetImage = s.PlanetImage,`
`943`	`947`	`Count = s.Count,`
`944`	`948`	`Needed = s.Needed,`
`945`		`- CanSelectForBattle = canDefend && !playerIsAttacker,`
	`949`	`+ CanSelectForBattle = canDefend && !playerIsAttackerAnywhere,`
`946`	`950`	`PlayerIsAttacker = playerIsAttacker,`
`947`	`951`	`PlayerIsDefender = playerName != null && s.DefenderNames.Contains(playerName),`
`948`	`952`	`AttackerFaction = s.AttackerFactionShortcut,`