Merge fix

Mage.Common/src/main/java/mage/interfaces/MageServer.java

@@ -49,8 +49,7 @@ public interface MageServer {
     List<ExpansionInfo> syncGetMissingExpansionData(List<String> codes);
     List<CardInfo> syncGetMissingCardsData(List<String> classNames);
 
-    // server state methods
+    ServerState getServerState() throws MageException; // TODO: need stable update process, so rename it after few releases
-    ServerState serverGetState() throws MageException;
 
     UUID serverGetMainRoomId() throws MageException;
 

Mage.Common/src/main/java/mage/remote/MageVersionException.java

@@ -8,18 +8,10 @@ import mage.utils.MageVersion;
  */
 public class MageVersionException extends MageException {
 
-    private final MageVersion serverVersion;
-
     public MageVersionException(MageVersion clientVersion, MageVersion serverVersion) {
         super("Wrong client version."
                 + "<br/>Your version: " + clientVersion
-                + "<br/>Server version: " + serverVersion
+                + "<br/>Server version: " + (serverVersion == null ? "unknown" : serverVersion)
-                + "<br/>Release app download: http://xmage.de"
+                + "<br/>App download: http://xmage.today");
-                + "<br/>BETA app download: http://xmage.today");
-        this.serverVersion = serverVersion;
-    }
-
-    public MageVersion getServerVersion() {
-        return serverVersion;
     }
 }

Mage.Common/src/main/java/mage/remote/SessionImpl.java

@@ -257,7 +257,10 @@ public class SessionImpl implements Session {
                 }
 
                 if (result) {
-                    serverState = server.serverGetState();
+                    serverState = server.getServerState();
+                    if (serverState == null) {
+                        throw new MageVersionException(client.getVersion(), null);
+                    }
 
                     // client side check for incompatible versions
                     if (client.getVersion().compareTo(serverState.getVersion()) != 0) {

Mage.Server/src/main/java/mage/server/MageServerImpl.java

@@ -954,7 +954,7 @@ public class MageServerImpl implements MageServer {
 
     @Override
     //TODO: check how often it is used
-    public ServerState serverGetState() throws MageException {
+    public ServerState getServerState() throws MageException {
         try {
             return new ServerState(
                     GameFactory.instance.getGameTypes(),

Mage.Server/src/main/java/mage/server/Main.java

@@ -287,7 +287,7 @@ public final class Main {
         try {
             MageServer testServer = (MageServer) TransporterClient.createTransporterClient(serverLocator.getLocatorURI(), MageServer.class, metadata);
             if (testServer != null) {
-                testServer.serverGetState();
+                testServer.getServerState();
                 return true;
             }
         } catch (Throwable t) {