From 4bb7ffd452772aa6b29977d1b531d7d0c384aafd Mon Sep 17 00:00:00 2001
From: betasteward <betasteward@gmail.com>
Date: Sat, 11 Jul 2015 07:40:06 -0400
Subject: [PATCH] added watch game methods

---
 .../src/main/java/mage/client/MageFrame.java  | 15 ++--
 .../main/java/mage/client/game/GamePane.java  |  5 +-
 .../main/java/mage/client/game/GamePanel.java |  4 +-
 .../mage/client/game/MultiConnectTest.java    |  5 ++
 .../main/java/org/mage/network/Client.java    | 22 +++--
 .../main/java/org/mage/network/Server.java    |  7 +-
 .../handlers/client/ClientMessageHandler.java | 29 ++++--
 .../mage/network/interfaces/MageClient.java   |  1 +
 .../mage/network/interfaces/MageServer.java   |  4 +
 .../messages/callback/WatchGameCallback.java  | 28 ++++++
 .../requests/StopWatchingRequest.java         | 23 +++++
 .../messages/requests/WatchGameRequest.java   | 25 ++++++
 .../messages/requests/WatchTableRequest.java  | 25 ++++++
 .../requests/WatchTournamentTableRequest.java | 23 +++++
 .../src/main/java/mage/server/ServerMain.java | 89 ++++++-------------
 .../java/mage/server/TableController.java     | 11 ++-
 .../main/java/mage/server/TableManager.java   |  5 +-
 .../src/main/java/mage/server/User.java       |  7 +-
 .../java/mage/server/game/GameController.java |  8 +-
 .../java/mage/server/game/GameManager.java    |  5 +-
 .../main/java/mage/server/game/GamesRoom.java |  3 +-
 .../java/mage/server/game/GamesRoomImpl.java  |  5 +-
 22 files changed, 235 insertions(+), 114 deletions(-)
 create mode 100644 Mage.Network/src/main/java/org/mage/network/messages/callback/WatchGameCallback.java
 create mode 100644 Mage.Network/src/main/java/org/mage/network/messages/requests/StopWatchingRequest.java
 create mode 100644 Mage.Network/src/main/java/org/mage/network/messages/requests/WatchGameRequest.java
 create mode 100644 Mage.Network/src/main/java/org/mage/network/messages/requests/WatchTableRequest.java
 create mode 100644 Mage.Network/src/main/java/org/mage/network/messages/requests/WatchTournamentTableRequest.java

diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java
index 26f52877701..6b5c43fa2cd 100644
--- a/Mage.Client/src/main/java/mage/client/MageFrame.java
+++ b/Mage.Client/src/main/java/mage/client/MageFrame.java
@@ -665,7 +665,8 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
         });
     }
 
-    public void watchGame(final UUID gameId) {
+    @Override
+    public void watchGame(final UUID gameId, final UUID chatId, final GameView game) {
         SwingUtilities.invokeLater(new Runnable() {
             @Override
             public void run() {
@@ -681,7 +682,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
                     desktopPane.add(gamePane, JLayeredPane.DEFAULT_LAYER);
                     gamePane.setMaximum(true);
                     gamePane.setVisible(true);
-                    gamePane.watchGame(gameId);
+                    gamePane.watchGame(gameId, chatId, game);
                     setActive(gamePane);
                 } catch (PropertyVetoException ex) {
                 }
@@ -1524,13 +1525,9 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
 
     @Override
     public void gameStarted(UUID gameId, UUID playerId) {
-//        try {
-            GameManager.getInstance().setCurrentPlayerUUID(playerId);
-            showGame(gameId, playerId);
-            logger.info("Game " + gameId + " started for player " + playerId);
-//        } catch (Exception ex) {
-//            handleException(ex);
-//        }
+        GameManager.getInstance().setCurrentPlayerUUID(playerId);
+        showGame(gameId, playerId);
+        logger.info("Game " + gameId + " started for player " + playerId);
 
         if (Plugins.getInstance().isCounterPluginLoaded()) {
             Plugins.getInstance().addGamesPlayed();
diff --git a/Mage.Client/src/main/java/mage/client/game/GamePane.java b/Mage.Client/src/main/java/mage/client/game/GamePane.java
index 9b7c00a5eb7..905a893fab5 100644
--- a/Mage.Client/src/main/java/mage/client/game/GamePane.java
+++ b/Mage.Client/src/main/java/mage/client/game/GamePane.java
@@ -38,6 +38,7 @@ import java.util.UUID;
 import javax.swing.SwingUtilities;
 import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE;
 import mage.client.MagePane;
+import mage.view.GameView;
 
 /**
  *
@@ -74,10 +75,10 @@ public class GamePane extends MagePane {
         this.removeFrame();
     }
 
-    public void watchGame(UUID gameId) {
+    public void watchGame(UUID gameId, UUID chatId, GameView game) {
         this.setTitle("Watching " + gameId);
         this.gameId = gameId;
-        gamePanel.watchGame(gameId, this);
+        gamePanel.watchGame(gameId, chatId, game, this);
     }
 
     public void replayGame(UUID gameId) {
diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
index 5f64dc2fb86..9341ca100eb 100644
--- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java
+++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java
@@ -400,7 +400,7 @@ public final class GamePanel extends javax.swing.JPanel {
         }
     }
 
-    public synchronized void watchGame(UUID gameId, GamePane gamePane) {
+    public synchronized void watchGame(UUID gameId, UUID chatId, GameView game, GamePane gamePane) {
         this.gameId = gameId;
         this.gamePane = gamePane;
         this.playerId = null;
@@ -423,13 +423,13 @@ public final class GamePanel extends javax.swing.JPanel {
 
         this.pnlReplay.setVisible(false);
         this.gameChatPanel.clear();
-        UUID chatId = client.watchGame(gameId);
         if (chatId == null) {
             removeGame();
         }
         else {
             this.gameChatPanel.connect(chatId);
         }
+        this.init(game);
         for (PlayAreaPanel panel : getPlayers().values()) {
             panel.setPlayingMode(false);
         }
diff --git a/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java b/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java
index ebfae09dceb..f4e22f60fd3 100644
--- a/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java
+++ b/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java
@@ -271,6 +271,11 @@ public class MultiConnectTest {
         public void tournamentStarted(UUID tournamentId) {
             throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
         }
+
+        @Override
+        public void watchGame(UUID gameId, UUID chatId, GameView game) {
+            throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        }
     }
 
     public static void main(String[] argv) throws Exception {
diff --git a/Mage.Network/src/main/java/org/mage/network/Client.java b/Mage.Network/src/main/java/org/mage/network/Client.java
index ed8d0aaebfa..f67e7fce48a 100644
--- a/Mage.Network/src/main/java/org/mage/network/Client.java
+++ b/Mage.Network/src/main/java/org/mage/network/Client.java
@@ -330,7 +330,11 @@ public class Client {
     }
 
     public void watchTournamentTable(UUID tableId) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        try {
+            clientMessageHandler.watchTournamentTable(tableId);
+        } catch (Exception ex) {
+            logger.error("Error watching tournament table", ex);
+        }
     }
 
     public UUID getTournamentChatId(UUID tournamentId) {
@@ -369,7 +373,11 @@ public class Client {
     }
 
     public void watchTable(UUID roomId, UUID tableId) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        try {
+            clientMessageHandler.watchTable(roomId, tableId);
+        } catch (Exception ex) {
+            logger.error("Error watching table", ex);
+        }
     }
 
     public void replayGame(UUID gameId) {
@@ -416,16 +424,16 @@ public class Client {
         return null;
     }
 
-    public UUID watchGame(UUID gameId) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
-    }
-
     public boolean startReplay(UUID gameId) {
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     }
 
     public void stopWatching(UUID gameId) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+        try {
+            clientMessageHandler.stopWatching(gameId);
+        } catch (Exception ex) {
+            logger.error("Error stopping watching game", ex);
+        }
     }
 
     public void stopReplay(UUID gameId) {
diff --git a/Mage.Network/src/main/java/org/mage/network/Server.java b/Mage.Network/src/main/java/org/mage/network/Server.java
index c2161d23f68..67ac550d4eb 100644
--- a/Mage.Network/src/main/java/org/mage/network/Server.java
+++ b/Mage.Network/src/main/java/org/mage/network/Server.java
@@ -75,6 +75,7 @@ import org.mage.network.messages.callback.SideboardCallback;
 import org.mage.network.messages.callback.StartDraftCallback;
 import org.mage.network.messages.callback.TournamentStartedCallback;
 import org.mage.network.messages.callback.UserRequestDialogCallback;
+import org.mage.network.messages.callback.WatchGameCallback;
 
 /**
  *
@@ -364,8 +365,10 @@ public class Server {
             ch.writeAndFlush(new ShowTournamentCallback(tournamentId)).addListener(WriteListener.getInstance());
     }
 
-    public void watchGame(String sessionId, UUID gameId) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    public void watchGame(String sessionId, UUID gameId, UUID chatId, GameView game) {
+        Channel ch = findChannel(sessionId);
+        if (ch != null)
+            ch.writeAndFlush(new WatchGameCallback(gameId, chatId, game)).addListener(WriteListener.getInstance());
     }
 
     public void replayGame(String sessionId, UUID gameId) {
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 39b3db1e2fc..4108299bfc9 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
@@ -1,12 +1,5 @@
 package org.mage.network.handlers.client;
 
-import org.mage.network.messages.requests.GetTournamentChatIdRequest;
-import org.mage.network.messages.requests.GetTournamentRequest;
-import org.mage.network.messages.requests.JoinTournamentRequest;
-import org.mage.network.messages.requests.StartTournamentRequest;
-import org.mage.network.messages.requests.CreateTournamentRequest;
-import org.mage.network.messages.requests.QuitTournamentRequest;
-import org.mage.network.messages.requests.QuitMatchRequest;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import java.io.Serializable;
@@ -31,11 +24,15 @@ import org.mage.network.messages.ClientMessage;
 import org.mage.network.messages.requests.ChatMessageRequest;
 import org.mage.network.messages.requests.ChatRoomIdRequest;
 import org.mage.network.messages.requests.CreateTableRequest;
+import org.mage.network.messages.requests.CreateTournamentRequest;
 import org.mage.network.messages.requests.GetRoomRequest;
+import org.mage.network.messages.requests.GetTournamentChatIdRequest;
+import org.mage.network.messages.requests.GetTournamentRequest;
 import org.mage.network.messages.requests.JoinChatRequest;
 import org.mage.network.messages.requests.JoinDraftRequest;
 import org.mage.network.messages.requests.JoinGameRequest;
 import org.mage.network.messages.requests.JoinTableRequest;
+import org.mage.network.messages.requests.JoinTournamentRequest;
 import org.mage.network.messages.requests.JoinTournamentTableRequest;
 import org.mage.network.messages.requests.LeaveChatRequest;
 import org.mage.network.messages.requests.LeaveTableRequest;
@@ -43,6 +40,8 @@ import org.mage.network.messages.requests.MarkCardRequest;
 import org.mage.network.messages.requests.PickCardRequest;
 import org.mage.network.messages.requests.PlayerActionRequest;
 import org.mage.network.messages.requests.QuitDraftRequest;
+import org.mage.network.messages.requests.QuitMatchRequest;
+import org.mage.network.messages.requests.QuitTournamentRequest;
 import org.mage.network.messages.requests.RemoveTableRequest;
 import org.mage.network.messages.requests.SendFeedbackRequest;
 import org.mage.network.messages.requests.SendPlayerBooleanRequest;
@@ -53,10 +52,14 @@ import org.mage.network.messages.requests.SendPlayerUUIDRequest;
 import org.mage.network.messages.requests.ServerMessagesRequest;
 import org.mage.network.messages.requests.SetPreferencesRequest;
 import org.mage.network.messages.requests.StartMatchRequest;
+import org.mage.network.messages.requests.StartTournamentRequest;
+import org.mage.network.messages.requests.StopWatchingRequest;
 import org.mage.network.messages.requests.SubmitDeckRequest;
 import org.mage.network.messages.requests.SwapSeatRequest;
 import org.mage.network.messages.requests.TableWaitingRequest;
 import org.mage.network.messages.requests.UpdateDeckRequest;
+import org.mage.network.messages.requests.WatchTableRequest;
+import org.mage.network.messages.requests.WatchTournamentTableRequest;
 
 /**
  *
@@ -301,4 +304,16 @@ public class ClientMessageHandler extends SimpleChannelInboundHandler<ClientMess
         return tournamentViewQueue.take();
     }
 
+    public void watchTournamentTable(UUID tableId) {
+        ctx.writeAndFlush(new WatchTournamentTableRequest(tableId)).addListener(WriteListener.getInstance());
+    }
+
+    public void watchTable(UUID roomId, UUID tableId) {
+        ctx.writeAndFlush(new WatchTableRequest(roomId, tableId)).addListener(WriteListener.getInstance());
+    }
+
+    public void stopWatching(UUID gameId) {
+        ctx.writeAndFlush(new StopWatchingRequest(gameId)).addListener(WriteListener.getInstance());
+    }
+
 }
diff --git a/Mage.Network/src/main/java/org/mage/network/interfaces/MageClient.java b/Mage.Network/src/main/java/org/mage/network/interfaces/MageClient.java
index c1920107da3..72b74ec21c1 100644
--- a/Mage.Network/src/main/java/org/mage/network/interfaces/MageClient.java
+++ b/Mage.Network/src/main/java/org/mage/network/interfaces/MageClient.java
@@ -71,4 +71,5 @@ public interface MageClient {
     void showTournament(UUID tournamentId);
     void tournamentStarted(UUID tournamentId);
     
+    void watchGame(UUID gameId, UUID chatId, GameView game);
 }
diff --git a/Mage.Network/src/main/java/org/mage/network/interfaces/MageServer.java b/Mage.Network/src/main/java/org/mage/network/interfaces/MageServer.java
index f39511ee7a9..e37ba81676b 100644
--- a/Mage.Network/src/main/java/org/mage/network/interfaces/MageServer.java
+++ b/Mage.Network/src/main/java/org/mage/network/interfaces/MageServer.java
@@ -73,6 +73,10 @@ public interface MageServer {
     boolean joinTournament(UUID tournamentId, String sessionId);
     void quitTournament(UUID tournamentId, String sessionId);
 
+    void watchTable(String sessionId, UUID roomId, UUID tableId);
+    void watchTournamentTable(String sessionId, UUID tableId);
+    void stopWatching(UUID gameId, String sessionId);
+    
     void pingTime(long milliSeconds, String sessionId);
 
 }
diff --git a/Mage.Network/src/main/java/org/mage/network/messages/callback/WatchGameCallback.java b/Mage.Network/src/main/java/org/mage/network/messages/callback/WatchGameCallback.java
new file mode 100644
index 00000000000..2d8099865b1
--- /dev/null
+++ b/Mage.Network/src/main/java/org/mage/network/messages/callback/WatchGameCallback.java
@@ -0,0 +1,28 @@
+package org.mage.network.messages.callback;
+
+import java.util.UUID;
+import mage.view.GameView;
+import org.mage.network.handlers.client.ClientMessageHandler;
+import org.mage.network.messages.ClientMessage;
+
+/**
+ *
+ * @author BetaSteward
+ */
+public class WatchGameCallback extends ClientMessage {
+    private final UUID gameId;
+    private final UUID chatId;
+    private final GameView game;
+
+    public WatchGameCallback(UUID gameId, UUID chatId, GameView game) {
+        this.gameId = gameId;
+        this.chatId = chatId;
+        this.game = game;
+    }
+
+    @Override
+    public void handleMessage(ClientMessageHandler handler) {
+        handler.getClient().watchGame(gameId, chatId, game);
+    }
+    
+}
diff --git a/Mage.Network/src/main/java/org/mage/network/messages/requests/StopWatchingRequest.java b/Mage.Network/src/main/java/org/mage/network/messages/requests/StopWatchingRequest.java
new file mode 100644
index 00000000000..1a38852ef8a
--- /dev/null
+++ b/Mage.Network/src/main/java/org/mage/network/messages/requests/StopWatchingRequest.java
@@ -0,0 +1,23 @@
+package org.mage.network.messages.requests;
+
+import io.netty.channel.ChannelHandlerContext;
+import java.util.UUID;
+import org.mage.network.interfaces.MageServer;
+
+/**
+ *
+ * @author BetaSteward
+ */
+public class StopWatchingRequest extends ServerRequest {
+    private final UUID gameId;
+
+    public StopWatchingRequest(UUID gameId) {
+        this.gameId = gameId;
+    }
+
+    @Override
+    public void handleMessage(MageServer server, ChannelHandlerContext ctx) {
+        server.stopWatching(gameId, getSessionId(ctx));
+    }
+    
+}
diff --git a/Mage.Network/src/main/java/org/mage/network/messages/requests/WatchGameRequest.java b/Mage.Network/src/main/java/org/mage/network/messages/requests/WatchGameRequest.java
new file mode 100644
index 00000000000..617074fa8c9
--- /dev/null
+++ b/Mage.Network/src/main/java/org/mage/network/messages/requests/WatchGameRequest.java
@@ -0,0 +1,25 @@
+//package org.mage.network.messages.requests;
+//
+//import io.netty.channel.ChannelHandlerContext;
+//import java.util.UUID;
+//import org.mage.network.handlers.WriteListener;
+//import org.mage.network.interfaces.MageServer;
+//import org.mage.network.messages.responses.UUIDResponse;
+//
+///**
+// *
+// * @author BetaSteward
+// */
+//public class WatchGameRequest extends ServerRequest {
+//    private final UUID gameId;
+//
+//    public WatchGameRequest(UUID gameId) {
+//        this.gameId = gameId;
+//    }
+//
+//    @Override
+//    public void handleMessage(MageServer server, ChannelHandlerContext ctx) {
+//        ctx.writeAndFlush(new UUIDResponse(server.watchGame(gameId, getSessionId(ctx)))).addListener(WriteListener.getInstance());
+//    }
+//    
+//}
diff --git a/Mage.Network/src/main/java/org/mage/network/messages/requests/WatchTableRequest.java b/Mage.Network/src/main/java/org/mage/network/messages/requests/WatchTableRequest.java
new file mode 100644
index 00000000000..bad9154b018
--- /dev/null
+++ b/Mage.Network/src/main/java/org/mage/network/messages/requests/WatchTableRequest.java
@@ -0,0 +1,25 @@
+package org.mage.network.messages.requests;
+
+import io.netty.channel.ChannelHandlerContext;
+import java.util.UUID;
+import org.mage.network.interfaces.MageServer;
+
+/**
+ *
+ * @author BetaSteward
+ */
+public class WatchTableRequest extends ServerRequest {
+    private final UUID roomId;
+    private final UUID tableId;
+
+    public WatchTableRequest(UUID roomId, UUID tableId) {
+        this.roomId = roomId;
+        this.tableId = tableId;
+    }
+
+    @Override
+    public void handleMessage(MageServer server, ChannelHandlerContext ctx) {
+        server.watchTable(getSessionId(ctx), roomId, tableId);
+    }
+    
+}
diff --git a/Mage.Network/src/main/java/org/mage/network/messages/requests/WatchTournamentTableRequest.java b/Mage.Network/src/main/java/org/mage/network/messages/requests/WatchTournamentTableRequest.java
new file mode 100644
index 00000000000..133ca028366
--- /dev/null
+++ b/Mage.Network/src/main/java/org/mage/network/messages/requests/WatchTournamentTableRequest.java
@@ -0,0 +1,23 @@
+package org.mage.network.messages.requests;
+
+import io.netty.channel.ChannelHandlerContext;
+import java.util.UUID;
+import org.mage.network.interfaces.MageServer;
+
+/**
+ *
+ * @author BetaSteward
+ */
+public class WatchTournamentTableRequest extends ServerRequest {
+    private final UUID tableId;
+
+    public WatchTournamentTableRequest(UUID tableId) {
+        this.tableId = tableId;
+    }
+
+    @Override
+    public void handleMessage(MageServer server, ChannelHandlerContext ctx) {
+        server.watchTournamentTable(getSessionId(ctx), tableId);
+    }
+    
+}
diff --git a/Mage.Server/src/main/java/mage/server/ServerMain.java b/Mage.Server/src/main/java/mage/server/ServerMain.java
index f6cbf422ab3..ecce6fb4bc8 100644
--- a/Mage.Server/src/main/java/mage/server/ServerMain.java
+++ b/Mage.Server/src/main/java/mage/server/ServerMain.java
@@ -703,55 +703,30 @@ public class ServerMain implements MageServer {
         GameManager.getInstance().sendPlayerAction(playerAction, gameId, session.getUserId(), data);
     }
       
-//    @Override
-//    public boolean watchTable(final String sessionId, final UUID roomId, final UUID tableId) throws MageException {
-//        return executeWithResult("setUserData", sessionId, new ActionWithBooleanResult() {
-//            @Override
-//            public Boolean execute() throws MageException {
-//                UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
-//                return GamesRoomManager.getInstance().getRoom(roomId).watchTable(userId, tableId);
-//            }
-//        });
-//    }
-//
-//    @Override
-//    public boolean watchTournamentTable(final String sessionId, final UUID tableId) throws MageException {
-//        return executeWithResult("setUserData", sessionId, new ActionWithBooleanResult() {
-//            @Override
-//            public Boolean execute() throws MageException {
-//                UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
-//                return TableManager.getInstance().watchTable(userId, tableId);
-//            }
-//        });
-//    }
-//
-//    @Override
-//    public void watchGame(final UUID gameId, final String sessionId) throws MageException {
-//        execute("watchGame", sessionId, new Action() {
-//            @Override
-//            public void execute() {
-//                UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
-//                GameManager.getInstance().watchGame(gameId, userId);
-//            }
-//        });
-//    }
-//
-//    @Override
-//    public void stopWatching(final UUID gameId, final String sessionId) throws MageException {
-//        execute("stopWatching", sessionId, new Action() {
-//            @Override
-//            public void execute() {
-//                UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
-//                User user = UserManager.getInstance().getUser(userId);
-//                if (user != null) {
-//                    GameManager.getInstance().stopWatching(gameId, userId);
-//                    user.removeGameWatchInfo(gameId);
-//                }
-//
-//            }
-//        });
-//    }
-//
+    @Override
+    public void watchTable(final String sessionId, final UUID roomId, final UUID tableId) {
+        UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
+        GamesRoomManager.getInstance().getRoom(roomId).watchTable(userId, tableId);
+    }
+
+    @Override
+    public void watchTournamentTable(final String sessionId, final UUID tableId) {
+        UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
+        TableManager.getInstance().watchTable(userId, tableId);
+    }
+
+
+    @Override
+    public void stopWatching(final UUID gameId, final String sessionId) {
+        UUID userId = SessionManager.getInstance().getSession(sessionId).getUserId();
+        User user = UserManager.getInstance().getUser(userId);
+        if (user != null) {
+            GameManager.getInstance().stopWatching(gameId, userId);
+            user.removeGameWatchInfo(gameId);
+        }
+
+    }
+
 //    @Override
 //    public void replayGame(final UUID gameId, final String sessionId) throws MageException {
 //        execute("replayGame", sessionId, new Action() {
@@ -1244,24 +1219,12 @@ public class ServerMain implements MageServer {
         server.showTournament(sessionId, tournamentId);
     }
 
-//    public void tournamentInit(String sessionId, UUID tournamentId, TournamentView tournamentView) {
-//        server.tournamentInit(sessionId, tournamentId, tournamentView);
-//    }
-
-//    public void tournamentUpdate(String sessionId, UUID tournamentId, TournamentView tournamentView) {
-//        server.tournamentUpdate(sessionId, tournamentId, tournamentView);
-//    }
-//
-//    public void tournamentOver(String sessionId, UUID tournamentId) {
-//        server.tournamentOver(sessionId, tournamentId);
-//    }
-
     public void showGameEndDialog(String sessionId, UUID gameId) {
         server.showGameEndDialog(sessionId, gameId);
     }
 
-    public void watchGame(String sessionId, UUID gameId) {
-        server.watchGame(sessionId, gameId);
+    public void watchGame(String sessionId, UUID gameId, UUID chatId, GameView game) {
+        server.watchGame(sessionId, gameId, chatId, game);
     }
 
     public void replayGame(String sessionId, UUID gameId) {
diff --git a/Mage.Server/src/main/java/mage/server/TableController.java b/Mage.Server/src/main/java/mage/server/TableController.java
index ac0bdf24b6c..53ffcd2ad16 100644
--- a/Mage.Server/src/main/java/mage/server/TableController.java
+++ b/Mage.Server/src/main/java/mage/server/TableController.java
@@ -434,22 +434,21 @@ public class TableController {
         }
     }
 
-    public boolean watchTable(UUID userId) {
+    public void watchTable(UUID userId) {
         if (table.isTournament()) {
             UserManager.getInstance().getUser(userId).showTournament(table.getTournament().getId());
-            return true;
         } else {
             if (table.isTournamentSubTable() && !table.getTournament().getOptions().isWatchingAllowed()) {
-                return false;
+                return;
             }
             if (table.getState() != TableState.DUELING) {
-                return false;
+                return;
             }
             // you can't watch your own game
             if (userPlayerMap.get(userId) != null) {
-                return false;
+                return;
             }
-            return UserManager.getInstance().getUser(userId).watchGame(match.getGame().getId());
+            UserManager.getInstance().getUser(userId).watchGame(match.getGame().getId(), getChatId());
         }
     }
 
diff --git a/Mage.Server/src/main/java/mage/server/TableManager.java b/Mage.Server/src/main/java/mage/server/TableManager.java
index fde53da79ba..69643ebffb3 100644
--- a/Mage.Server/src/main/java/mage/server/TableManager.java
+++ b/Mage.Server/src/main/java/mage/server/TableManager.java
@@ -270,11 +270,10 @@ public class TableManager {
         }
     }
 
-    public boolean watchTable(UUID userId, UUID tableId) {
+    public void watchTable(UUID userId, UUID tableId) {
         if (controllers.containsKey(tableId)) {
-            return controllers.get(tableId).watchTable(userId);
+            controllers.get(tableId).watchTable(userId);
         }
-        return false;
     }
 
 //    public boolean replayTable(UUID userId, UUID tableId) {
diff --git a/Mage.Server/src/main/java/mage/server/User.java b/Mage.Server/src/main/java/mage/server/User.java
index e9ee1f87662..982fdd5f068 100644
--- a/Mage.Server/src/main/java/mage/server/User.java
+++ b/Mage.Server/src/main/java/mage/server/User.java
@@ -330,9 +330,10 @@ public class User {
         ServerMain.getInstance().informClient(sessionId, title, message, MessageType.ERROR);
     }
 
-    public boolean watchGame(final UUID gameId) {
-        ServerMain.getInstance().watchGame(sessionId, gameId);
-        return true;
+    public void watchGame(final UUID gameId, UUID chatId) {
+        GameView game = GameManager.getInstance().watchGame(gameId, userId);
+        if (game != null)
+            ServerMain.getInstance().watchGame(sessionId, gameId, chatId, game);
     }
 
     public void replayGame(final UUID gameId) {
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 4d1feba65b9..f1583e8802a 100644
--- a/Mage.Server/src/main/java/mage/server/game/GameController.java
+++ b/Mage.Server/src/main/java/mage/server/game/GameController.java
@@ -433,14 +433,14 @@ public class GameController implements GameCallback {
         return true;
     }
 
-    public void watch(UUID userId) {
+    public GameView watch(UUID userId) {
         if (userPlayerMap.get(userId) != null) {
             // You can't watch a game if you already a player in it
-            return;
+            return null;
         }
         if (watchers.get(userId) != null) {
             // You can't watch a game if you already watch it
-            return;
+            return null;
         }
         User user = UserManager.getInstance().getUser(userId);
         if (user != null) {
@@ -449,7 +449,9 @@ public class GameController implements GameCallback {
             gameWatcher.init();
             user.addGameWatchInfo(game.getId());
             ChatManager.getInstance().broadcast(chatId, user, " has started watching", MessageColor.BLUE, true, ChatMessage.MessageType.STATUS);
+            return watchers.get(userId).getGameView();
         }
+        return null;
     }
 
     public void stopWatching(UUID userId) {
diff --git a/Mage.Server/src/main/java/mage/server/game/GameManager.java b/Mage.Server/src/main/java/mage/server/game/GameManager.java
index 0b4b2e9c37e..447cf8248e3 100644
--- a/Mage.Server/src/main/java/mage/server/game/GameManager.java
+++ b/Mage.Server/src/main/java/mage/server/game/GameManager.java
@@ -122,11 +122,12 @@ public class GameManager {
         }
     }
 
-    public void watchGame(UUID gameId, UUID userId) {
+    public GameView watchGame(UUID gameId, UUID userId) {
         GameController gameController = gameControllers.get(gameId);
         if (gameController != null) {
-            gameController.watch(userId);
+            return gameController.watch(userId);
         }
+        return null;
     }
 
     public void stopWatching(UUID gameId, UUID userId) {
diff --git a/Mage.Server/src/main/java/mage/server/game/GamesRoom.java b/Mage.Server/src/main/java/mage/server/game/GamesRoom.java
index 03bbf7271d1..20319f3fc21 100644
--- a/Mage.Server/src/main/java/mage/server/game/GamesRoom.java
+++ b/Mage.Server/src/main/java/mage/server/game/GamesRoom.java
@@ -29,7 +29,6 @@
 package mage.server.game;
 
 import java.util.UUID;
-import mage.MageException;
 import mage.cards.decks.DeckCardLists;
 import mage.game.match.MatchOptions;
 import mage.game.tournament.TournamentOptions;
@@ -51,7 +50,7 @@ public interface GamesRoom extends Room {
     void removeTable(UUID tableId);
     TableView getTable(UUID tableId);
     void leaveTable(UUID userId, UUID tableId);
-    boolean watchTable(UUID userId, UUID tableId) throws MageException;
+    void watchTable(UUID userId, UUID tableId);
 
     public RoomView getRoomView();
 
diff --git a/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java b/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java
index b236abbd0d8..3aee2bfa6fd 100644
--- a/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java
+++ b/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java
@@ -39,7 +39,6 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
-import mage.MageException;
 import mage.cards.decks.DeckCardLists;
 import mage.constants.TableState;
 import mage.game.Table;
@@ -200,8 +199,8 @@ public class GamesRoomImpl extends RoomImpl implements GamesRoom, Serializable {
     }
 
     @Override
-    public boolean watchTable(UUID userId, UUID tableId) throws MageException {
-        return TableManager.getInstance().watchTable(userId, tableId);
+    public void watchTable(UUID userId, UUID tableId) {
+        TableManager.getInstance().watchTable(userId, tableId);
     }
 
     @Override