From 1f18f9da050e6f7f69971abb3474fc0ae2146f6d Mon Sep 17 00:00:00 2001
From: elcnesh <elcnesh@cardforge.org>
Date: Tue, 19 May 2015 09:25:04 +0000
Subject: [PATCH] Set current player more quickly to prevent exception at match
 start

---
 forge-gui/src/main/java/forge/match/AbstractGuiGame.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/forge-gui/src/main/java/forge/match/AbstractGuiGame.java b/forge-gui/src/main/java/forge/match/AbstractGuiGame.java
index 54f2b22c8f6..61061453bcf 100644
--- a/forge-gui/src/main/java/forge/match/AbstractGuiGame.java
+++ b/forge-gui/src/main/java/forge/match/AbstractGuiGame.java
@@ -89,8 +89,13 @@ public abstract class AbstractGuiGame implements IGuiGame, IMayViewCards {
         if (player == null || gameController == null) {
             throw new IllegalArgumentException();
         }
+
+        final boolean doSetCurrentPlayer = originalGameControllers.isEmpty();
         originalGameControllers.put(player, gameController);
         gameControllers.put(player, gameController);
+        if (doSetCurrentPlayer) {
+            setCurrentPlayer(player);
+        }
     }
 
     @Override