From 8bff961cafaf2d212fae9eb013ad0a679b611ab9 Mon Sep 17 00:00:00 2001
From: betasteward <betasteward@gmail.com>
Date: Mon, 20 Jul 2015 21:34:18 -0400
Subject: [PATCH] fixed some bugs + improved some messages

---
 Mage.Common/src/mage/view/TableView.java             |  9 +++++++++
 .../handlers/client/ClientMessageHandler.java        |  7 ++++++-
 Mage.Server/release/config/config.xml                |  1 +
 .../src/main/java/mage/server/TableController.java   |  8 ++++----
 .../main/java/mage/server/game/GameController.java   | 12 ++++++------
 5 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/Mage.Common/src/mage/view/TableView.java b/Mage.Common/src/mage/view/TableView.java
index 8005e9d9e94..98ebe7caa1b 100644
--- a/Mage.Common/src/mage/view/TableView.java
+++ b/Mage.Common/src/mage/view/TableView.java
@@ -63,6 +63,15 @@ public class TableView implements Serializable {
     private List<SeatView> seats = new ArrayList<>();
     private List<UUID> games = new ArrayList<>();
 
+    public static TableView emptyTableView = new TableView();
+    
+    private TableView() {
+        deckType = "";
+        additionalInfo = "";
+        skillLevel = SkillLevel.BEGINNER;
+        tableStateText = "Empty";
+    }
+    
     public TableView(Table table) {    
         this.tableId = table.getId();
         this.gameType = table.getGameType();
diff --git a/Mage.Network/src/main/java/org/mage/network/handlers/client/ClientMessageHandler.java b/Mage.Network/src/main/java/org/mage/network/handlers/client/ClientMessageHandler.java
index 4108299bfc9..a4d4a95a4b1 100644
--- a/Mage.Network/src/main/java/org/mage/network/handlers/client/ClientMessageHandler.java
+++ b/Mage.Network/src/main/java/org/mage/network/handlers/client/ClientMessageHandler.java
@@ -223,7 +223,12 @@ public class ClientMessageHandler extends SimpleChannelInboundHandler<ClientMess
     }
 
     public void receiveTableView(TableView view) {
-        tableViewQueue.offer(view);
+        if (view == null) {
+            tableViewQueue.offer(TableView.emptyTableView);
+        }
+        else {
+            tableViewQueue.offer(view);
+        }
     }
     
     public void receiveTournamentView(TournamentView view) {
diff --git a/Mage.Server/release/config/config.xml b/Mage.Server/release/config/config.xml
index c18cbdeb3af..9e6a47f3b10 100644
--- a/Mage.Server/release/config/config.xml
+++ b/Mage.Server/release/config/config.xml
@@ -16,6 +16,7 @@
             userNamePattern="[^a-z0-9_]"
             maxAiOpponents="15"
             saveGameActivated="false"
+            useSSL="true"
     />
     <playerTypes>
         <playerType name="Human" jar="mage-player-human-${project.version}.jar" className="mage.player.human.HumanPlayer"/>
diff --git a/Mage.Server/src/main/java/mage/server/TableController.java b/Mage.Server/src/main/java/mage/server/TableController.java
index dc18bc4d933..49d47538656 100644
--- a/Mage.Server/src/main/java/mage/server/TableController.java
+++ b/Mage.Server/src/main/java/mage/server/TableController.java
@@ -179,7 +179,7 @@ public class TableController {
                     deck = Deck.load(deckList, false, false);
                 } catch (GameException ex) {
                     logger.error("Error loading deck", ex);
-                    user.showUserMessage("Join Table", "Error loading deck");
+                    user.showUserMessage("Join Table", "Error loading deck: " + ex.getMessage());
                     return false;
                 }
             } else {
@@ -280,7 +280,7 @@ public class TableController {
             deck = Deck.load(deckList, false, false);
         } catch (GameException ex) {
             logger.error("Error load deck", ex);
-            user.showUserMessage("Join Table", "Error loading deck");
+            user.showUserMessage("Join Table", "Error loading deck:" + ex.getMessage());
             return false;
         }
 
@@ -373,7 +373,7 @@ public class TableController {
         }
         catch (GameException ex) {
             logger.error("Error loading deck", ex);
-            user.showUserError("Submit deck", "Error loading deck");
+            user.showUserError("Submit deck", "Error loading deck: " + ex.getMessage());
             return false;
         }
         if (table.getState() == TableState.SIDEBOARDING && table.getMatch() != null) {
@@ -402,7 +402,7 @@ public class TableController {
         }
         catch (GameException ex) {
             logger.error("Error loading deck", ex);
-            user.showUserError("Update deck", "Error loading deck");
+            user.showUserError("Update deck", "Error loading deck: " + ex.getMessage());
             return;
         }
         updateDeck(userId, playerId, deck);
diff --git a/Mage.Server/src/main/java/mage/server/game/GameController.java b/Mage.Server/src/main/java/mage/server/game/GameController.java
index d6c24a0b060..5606c4d4db0 100644
--- a/Mage.Server/src/main/java/mage/server/game/GameController.java
+++ b/Mage.Server/src/main/java/mage/server/game/GameController.java
@@ -407,12 +407,12 @@ public class GameController implements GameCallback {
         if (allJoined()) {
             joinWaitingExecutor.shutdownNow();
             ThreadExecutor.getInstance().getCallExecutor().execute(
-                    new Runnable() {
-                        @Override
-                        public void run() {
-                            startGame();
-                        }
-                    });
+                new Runnable() {
+                    @Override
+                    public void run() {
+                        startGame();
+                    }
+                });
         }
     }