external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed a bug with team allocation for variant matches

Browse Source
This commit is contained in:
moomarc
2014-02-18 12:30:13 +00:00
parent f23f17be4f
commit 03cdddce6e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuConstructed.java
View File

@@ -203,9 +203,9 @@ public enum CSubmenuConstructed implements ICDoc, IMenuProvider {
LobbyPlayer lobbyPlayer = view.isPlayerAI(i) ? lobby.getAiPlayer(name,
view.getPlayerAvatar(i)) : lobby.getGuiPlayer();
RegisteredPlayer rp = view.getDeckChooser(i).getPlayer();
rp.setTeamNumber(view.getTeam(i));
if (variantTypes.isEmpty()) {
rp.setTeamNumber(view.getTeam(i));
players.add(rp.setPlayer(lobbyPlayer));
} else {
// Initialise Variant variables
@@ -307,8 +307,9 @@ public enum CSubmenuConstructed implements ICDoc, IMenuProvider {
}
}
players.add(RegisteredPlayer.forVariants(variantTypes, rp.getDeck(), schemes,
playerIsArchenemy, planes, vanguardAvatar).setPlayer(lobbyPlayer));
rp = RegisteredPlayer.forVariants(variantTypes, rp.getDeck(), schemes, playerIsArchenemy, planes, vanguardAvatar);
rp.setTeamNumber(view.getTeam(i));
players.add(rp.setPlayer(lobbyPlayer));
}
view.getDeckChooser(i).saveState();
}

1
forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java
View File

@@ -1030,7 +1030,6 @@ public enum VSubmenuConstructed implements IVSubmenu<CSubmenuConstructed> {
public boolean isEnoughTeams() {
int lastTeam = -1;
final List<Integer> teamList = appliedVariants.contains(GameType.Archenemy) ? archenemyTeams : teams;
System.out.println(teamList);
for (final int i : getParticipants()) {
if (lastTeam == -1) {