From 259291367fcb15da8c3c3d0427f9337776d8416f Mon Sep 17 00:00:00 2001 From: elcnesh Date: Sat, 4 Apr 2015 14:24:25 +0000 Subject: [PATCH] Prevent NPE when watching a game --- .../src/main/java/forge/screens/match/CMatchUI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java index 2ba76261dae..37723fe6e9c 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java @@ -792,7 +792,7 @@ public final class CMatchUI // Sort players FCollectionView players = gameView.getPlayers(); - if (players.size() == 2 && myPlayers.size() == 1 && myPlayers.get(0).equals(players.get(1))) { + if (players.size() == 2 && myPlayers != null && myPlayers.size() == 1 && myPlayers.get(0).equals(players.get(1))) { players = new FCollection(new PlayerView[] { players.get(1), players.get(0) }); } initMatch(players, myPlayers);