From bc9dca4d8a6a930bc822c6c19e927aa11f797a03 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Mon, 15 Jul 2013 00:53:30 +0200
Subject: [PATCH] Fixed some handling to possible NPEs.

---
 Mage.Common/src/mage/view/TableView.java                    | 5 ++++-
 .../src/mage/player/human/HumanPlayer.java                  | 6 +++++-
 Mage/src/mage/game/Table.java                               | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Mage.Common/src/mage/view/TableView.java b/Mage.Common/src/mage/view/TableView.java
index 6888788e035..9a482802afe 100644
--- a/Mage.Common/src/mage/view/TableView.java
+++ b/Mage.Common/src/mage/view/TableView.java
@@ -81,7 +81,10 @@ public class TableView implements Serializable {
             StringBuilder sb = new StringBuilder();
             StringBuilder sbScore = new StringBuilder();
             for(MatchPlayer matchPlayer: table.getMatch().getPlayers()) {
-                if (!matchPlayer.getPlayer().getName().equals(table.getControllerName())) {
+                if (matchPlayer.getPlayer() == null) {
+                    sb.append(", ").append("[unknown]");
+                    sbScore.append("-").append(matchPlayer.getWins());
+                } else if (!matchPlayer.getPlayer().getName().equals(table.getControllerName())) {
                     sb.append(", ").append(matchPlayer.getPlayer().getName());
                     sbScore.append("-").append(matchPlayer.getWins());
                 } else {
diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
index cc6a3bbb5df..851564a7a9c 100644
--- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
+++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
@@ -701,7 +701,11 @@ public class HumanPlayer extends PlayerImpl<HumanPlayer> {
         updateGameStatePriority("getAmount", game);
         game.fireGetAmountEvent(playerId, message, min, max);
         waitForIntegerResponse(game);
-        return response.getInteger();
+        if (response != null) {
+            return response.getInteger();
+        } else {
+            return 0;
+        }
     }
 
     @Override
diff --git a/Mage/src/mage/game/Table.java b/Mage/src/mage/game/Table.java
index e0274b3e18f..be237492e02 100644
--- a/Mage/src/mage/game/Table.java
+++ b/Mage/src/mage/game/Table.java
@@ -32,8 +32,8 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
-import mage.constants.TableState;
 import mage.cards.decks.DeckValidator;
+import mage.constants.TableState;
 import mage.game.events.Listener;
 import mage.game.events.TableEvent;
 import mage.game.events.TableEventSource;
@@ -56,6 +56,7 @@ public class Table implements Serializable {
     private Seat[] seats;
     private int numSeats;
     private boolean isTournament;
+    private boolean isTournamentSubTable;
     private DeckValidator validator;
     private TableState state = TableState.WAITING;
     private Match match;