From a76a8a8ff6f8c6f7ec459e8bcb7169e88a6d6fd4 Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Sun, 21 Oct 2012 12:05:56 +0000
Subject: [PATCH] PlayerStartConditions is ok GameNew won't fetch supplier
 twice

---
 src/main/java/forge/game/GameNew.java               | 5 +++--
 src/main/java/forge/game/PlayerStartConditions.java | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/forge/game/GameNew.java b/src/main/java/forge/game/GameNew.java
index 350e009ef3c..ff268762d83 100644
--- a/src/main/java/forge/game/GameNew.java
+++ b/src/main/java/forge/game/GameNew.java
@@ -113,8 +113,9 @@ public class GameNew {
             player.setStartingLife(p.getValue().getStartingLife());
             // what if I call it for AI player?
             PlayerZone bf = player.getZone(ZoneType.Battlefield);
-            if (p.getValue().getCardsOnTable() != null) {
-                for (final Card c : p.getValue().getCardsOnTable()) {
+            Iterable<Card> onTable = p.getValue().getCardsOnTable(); 
+            if (onTable != null) {
+                for (final Card c : onTable) {
                     c.addController(player);
                     c.setOwner(player);
                     bf.add(c, false);
diff --git a/src/main/java/forge/game/PlayerStartConditions.java b/src/main/java/forge/game/PlayerStartConditions.java
index 111af7c0166..3dac637c4d9 100644
--- a/src/main/java/forge/game/PlayerStartConditions.java
+++ b/src/main/java/forge/game/PlayerStartConditions.java
@@ -22,7 +22,7 @@ public class PlayerStartConditions {
         return startingLife;
     }
     public final Iterable<Card> getCardsOnTable() {
-        return cardsOnTable.get();
+        return  cardsOnTable == null ? null : cardsOnTable.get();
     }
 
     public final void setStartingLife(int startingLife) {