From d024d59626dbe3e81ebb97e3502f151112d6cbf9 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sun, 27 Aug 2017 00:31:52 +0200
Subject: [PATCH] * Some changes to chat and user handling.

---
 .../src/main/java/mage/utils/MageVersion.java |  2 +-
 .../main/java/mage/server/ChatManager.java    | 22 +++++++++----------
 .../src/main/java/mage/server/User.java       |  2 ++
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Mage.Common/src/main/java/mage/utils/MageVersion.java b/Mage.Common/src/main/java/mage/utils/MageVersion.java
index be588e85f25..5d121360816 100644
--- a/Mage.Common/src/main/java/mage/utils/MageVersion.java
+++ b/Mage.Common/src/main/java/mage/utils/MageVersion.java
@@ -41,7 +41,7 @@ public class MageVersion implements Serializable, Comparable<MageVersion> {
     public final static int MAGE_VERSION_MAJOR = 1;
     public final static int MAGE_VERSION_MINOR = 4;
     public final static int MAGE_VERSION_PATCH = 26;
-    public final static String MAGE_VERSION_MINOR_PATCH = "V1";
+    public final static String MAGE_VERSION_MINOR_PATCH = "V2";
     public final static String MAGE_VERSION_INFO = "";
 
     private final int major;
diff --git a/Mage.Server/src/main/java/mage/server/ChatManager.java b/Mage.Server/src/main/java/mage/server/ChatManager.java
index ac5f818ee78..1fdebab217f 100644
--- a/Mage.Server/src/main/java/mage/server/ChatManager.java
+++ b/Mage.Server/src/main/java/mage/server/ChatManager.java
@@ -86,19 +86,17 @@ public enum ChatManager {
         if (chatId != null) {
             ChatSession chatSession = chatSessions.get(chatId);
             if (chatSession != null) {
-                synchronized (chatSession) {
-                    if (chatSessions.containsKey(chatId)) {
-                        final Lock w = lock.writeLock();
-                        w.lock();
-                        try {
-                            chatSessions.remove(chatId);
-                        } finally {
-                            w.unlock();
-                        }
-                        logger.trace("Chat removed - chatId: " + chatId);
-                    } else {
-                        logger.trace("Chat to destroy does not exist - chatId: " + chatId);
+                if (chatSessions.containsKey(chatId)) {
+                    final Lock w = lock.writeLock();
+                    w.lock();
+                    try {
+                        chatSessions.remove(chatId);
+                    } finally {
+                        w.unlock();
                     }
+                    logger.trace("Chat removed - chatId: " + chatId);
+                } else {
+                    logger.trace("Chat to destroy does not exist - chatId: " + chatId);
                 }
             }
         }
diff --git a/Mage.Server/src/main/java/mage/server/User.java b/Mage.Server/src/main/java/mage/server/User.java
index a176a9bd04d..817ad3b313c 100644
--- a/Mage.Server/src/main/java/mage/server/User.java
+++ b/Mage.Server/src/main/java/mage/server/User.java
@@ -386,6 +386,8 @@ public class User {
             if (controller.isPresent()) {
                 ccSideboard(entry.getValue(), entry.getKey(), controller.get().getRemainingTime(), controller.get().getOptions().isLimited());
             } else {
+                // Table is missing after connection was lost during sideboard.
+                // Means other players were removed or conceded the game?
                 logger.error("sideboarding id not found : " + entry.getKey());
             }
         }