From 26c0df6e0524fb5eba6440949b0755225b92fc7d Mon Sep 17 00:00:00 2001 From: "Jamin W. Collins" Date: Wed, 28 Feb 2018 18:24:19 -0700 Subject: [PATCH] network play: fix for Commander and Tiny Leaders variants This method is called numerous times, many before the Commander data has been populated on the PlayerView objects. This is reflected a few lines above where similar logic is applied to the current PlayerView. This simply applies similar logic to the player's opponents. Signed-off-by: Jamin W. Collins --- forge-game/src/main/java/forge/game/player/PlayerView.java | 6 ++++++ .../src/main/java/forge/screens/home/VLobby.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/player/PlayerView.java b/forge-game/src/main/java/forge/game/player/PlayerView.java index f8dffa5482b..b5aeb4874a7 100644 --- a/forge-game/src/main/java/forge/game/player/PlayerView.java +++ b/forge-game/src/main/java/forge/game/player/PlayerView.java @@ -129,6 +129,12 @@ public class PlayerView extends GameEntityView { } final FCollectionView opponents = getOpponents(); + for (PlayerView opponent: opponents) { + if (opponent.getCommanders() == null) { + return Collections.emptyList(); + } + } + final List info = Lists.newArrayListWithExpectedSize(opponents.size()); info.add(TextUtil.concatWithSpace("Commanders:", Lang.joinHomogenous(commanders))); for (final PlayerView p : Iterables.concat(Collections.singleton(this), opponents)) { diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java b/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java index 72ad2c8c6fd..1dad755e7ad 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java @@ -94,7 +94,7 @@ public class VLobby implements ILobbyView { private final VariantCheckBox vntArchenemy = new VariantCheckBox(GameType.Archenemy); private final VariantCheckBox vntArchenemyRumble = new VariantCheckBox(GameType.ArchenemyRumble); private final ImmutableList vntBoxes = - ImmutableList.of(); + ImmutableList.of(vntCommander, vntTinyLeaders); // ImmutableList.of(vntVanguard, vntMomirBasic, vntCommander, vntTinyLeaders, vntPlanechase, vntArchenemy, vntArchenemyRumble); // Player frame elements