From 8bf5f01c2e1ed699588bf11720f44339b9e7e363 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Wed, 30 Jul 2014 14:38:55 +0200
Subject: [PATCH] Fixed a handling bug in TournamentController. Modified some
 debug messages.

---
 .../src/main/java/mage/server/ChatManager.java |  2 +-
 .../src/main/java/mage/server/ChatSession.java |  1 +
 .../tournament/TournamentController.java       | 18 ++++++++++++------
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Mage.Server/src/main/java/mage/server/ChatManager.java b/Mage.Server/src/main/java/mage/server/ChatManager.java
index 2c3cb7c3c3a..e89abe831c1 100644
--- a/Mage.Server/src/main/java/mage/server/ChatManager.java
+++ b/Mage.Server/src/main/java/mage/server/ChatManager.java
@@ -161,7 +161,7 @@ public class ChatManager {
     }
 
     public void removeUser(UUID userId, DisconnectReason reason) {
-        Logger.getLogger(ChatManager.class).debug("ChatManager: Remove user start");
+        Logger.getLogger(ChatManager.class).debug("ChatManager: Remove user start - chatSessions: " + chatSessions.size());
         for (ChatSession chat: chatSessions.values()) {
             chat.kill(userId, reason);
         }
diff --git a/Mage.Server/src/main/java/mage/server/ChatSession.java b/Mage.Server/src/main/java/mage/server/ChatSession.java
index 0d691efcf96..83e3f405493 100644
--- a/Mage.Server/src/main/java/mage/server/ChatSession.java
+++ b/Mage.Server/src/main/java/mage/server/ChatSession.java
@@ -139,6 +139,7 @@ public class ChatSession {
                     user.fireCallback(new ClientCallback("chatMessage", chatId, new ChatMessage(username, msg, time, color, messageType, soundToPlay)));
                 }
                 else {
+                    logger.debug("ChatSession.broadcast user not found - killed from chat session - userId: " + userId +"  chatId: " +chatId);
                     kill(userId, DisconnectReason.CleaningUp);
                 }
             }
diff --git a/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java b/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java
index 6b710076be0..8f2da2624db 100644
--- a/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java
+++ b/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java
@@ -150,19 +150,25 @@ public class TournamentController {
     public synchronized void join(UUID userId) {
         UUID playerId = userPlayerMap.get(userId);
         if (playerId == null) {
-            logger.error("join: got no playerId  for userId: " + userId + " for tournament " + tournament.getId());
+            if (logger.isDebugEnabled()) {
+                User user = UserManager.getInstance().getUser(userId);
+                if (user != null) {
+                    logger.debug(user.getName() + " shows tournament panel  tournamentId: " + tournament.getId());
+                }
+            }
             return;
         }
+        if (tournamentSessions.containsKey(playerId)) {
+            logger.debug("player reopened tournament panel   userId: " + userId + " tournamentId: " + tournament.getId());
+            return;
+        } 
+        // first join of player
         TournamentSession tournamentSession = new TournamentSession(tournament, userId, tableId, playerId);
-        if (tournamentSessions == null) {
-            logger.error("join: got no playerId  for userId: " + userId + " for tournament " + tournament.getId());
-            return;
-        }
         tournamentSessions.put(playerId, tournamentSession);
         UserManager.getInstance().getUser(userId).addTournament(playerId, tournamentSession);
         TournamentPlayer player = tournament.getPlayer(playerId);
         player.setJoined();
-        logger.debug("player " + playerId + " has joined tournament " + tournament.getId());
+        logger.debug("player " +player.getPlayer().getName()  + " - client has joined tournament " + tournament.getId());
         ChatManager.getInstance().broadcast(chatId, "", player.getPlayer().getName() + " has joined the tournament", MessageColor.BLACK, true, MessageType.STATUS);
         checkStart();
     }