From 2e08d224b312e11160d68f5204ca5eac3e18b023 Mon Sep 17 00:00:00 2001
From: Sol <zenchristo@gmail.com>
Date: Thu, 21 Apr 2016 15:25:02 +0000
Subject: [PATCH] - Only create a BYE pairing if there's an assigned Bye Player

---
 .../java/forge/tournament/system/TournamentSwiss.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/forge-gui/src/main/java/forge/tournament/system/TournamentSwiss.java b/forge-gui/src/main/java/forge/tournament/system/TournamentSwiss.java
index 1fa4e224703..9ca4e506219 100644
--- a/forge-gui/src/main/java/forge/tournament/system/TournamentSwiss.java
+++ b/forge-gui/src/main/java/forge/tournament/system/TournamentSwiss.java
@@ -54,11 +54,14 @@ public class TournamentSwiss extends AbstractTournament {
         List<TournamentPlayer> leftoverPlayers = new ArrayList<>();
 
         List<TournamentPlayer> groupPlayers = Lists.newArrayList(allPlayers);
-        groupPlayers.remove(byePlayer);
 
-        TournamentPairing byePair = new TournamentPairing(activeRound, Lists.<TournamentPlayer>newArrayList(byePlayer));
-        byePair.setBye(true);
-        activePairings.add(byePair);
+        if (byePlayer != null) {
+            groupPlayers.remove(byePlayer);
+
+            TournamentPairing byePair = new TournamentPairing(activeRound, Lists.<TournamentPlayer>newArrayList(byePlayer));
+            byePair.setBye(true);
+            activePairings.add(byePair);
+        }
 
         if (groupPlayers.isEmpty()) {
             return;