diff --git a/Mage.Client/pom.xml b/Mage.Client/pom.xml
index fb8ab7cab9..e0387aecee 100644
--- a/Mage.Client/pom.xml
+++ b/Mage.Client/pom.xml
@@ -6,7 +6,7 @@
org.mage
mage-root
- 1.3.0
+ 1.4.0
org.mage
diff --git a/Mage.Common/pom.xml b/Mage.Common/pom.xml
index 84f162351f..4fb50ddd53 100644
--- a/Mage.Common/pom.xml
+++ b/Mage.Common/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-root
- 1.3.0
+ 1.4.0
mage-common
diff --git a/Mage.Common/src/mage/remote/SessionImpl.java b/Mage.Common/src/mage/remote/SessionImpl.java
index 026895ec3b..3ae7e62208 100644
--- a/Mage.Common/src/mage/remote/SessionImpl.java
+++ b/Mage.Common/src/mage/remote/SessionImpl.java
@@ -269,6 +269,7 @@ public class SessionImpl implements Session {
logger.warn("There should be one callback Connector (number existing = " + callbackConnectors.size() + ")");
}
+ logger.info("Trying to connect as " + (this.getUserName() == null ? "":this.getUserName()) + " to XMAGE server at " + connection.getHost() + ":" + connection.getPort());
callbackClient.invoke(null);
this.sessionId = callbackClient.getSessionId();
@@ -342,7 +343,7 @@ public class SessionImpl implements Session {
}
client.showMessage(sb.toString());
}
- }
+ }
return false;
}
@@ -1367,7 +1368,9 @@ public class SessionImpl implements Session {
private void handleThrowable(Throwable t) {
logger.fatal("Communication error", t);
- disconnect(true);
+ // Probably this can cause hanging the client under certain circumstances as the disconnect method is synchronized
+ // so check if it's needed
+ // disconnect(true);
}
private void handleMageException(MageException ex) {
@@ -1413,7 +1416,7 @@ public class SessionImpl implements Session {
if (isConnected()) {
long startTime = System.nanoTime();
if (!server.ping(sessionId, pingInfo)) {
- logger.error(new StringBuilder("Ping failed: ").append(this.getUserName()).append(" Session: ").append(sessionId).append(" to MAGE server at ").append(connection.getHost()).append(":").append(connection.getPort()).toString());
+ logger.error("Ping failed: " + this.getUserName() + " Session: " + sessionId + " to MAGE server at " + connection.getHost() +":" + connection.getPort());
throw new MageException("Ping failed");
}
pingTime.add(System.nanoTime() - startTime);
diff --git a/Mage.Common/src/mage/utils/MageVersion.java b/Mage.Common/src/mage/utils/MageVersion.java
index a6831be59e..260e9c8773 100644
--- a/Mage.Common/src/mage/utils/MageVersion.java
+++ b/Mage.Common/src/mage/utils/MageVersion.java
@@ -40,9 +40,9 @@ public class MageVersion implements Serializable, Comparable {
*
*/
public final static int MAGE_VERSION_MAJOR = 1;
- public final static int MAGE_VERSION_MINOR = 3;
+ public final static int MAGE_VERSION_MINOR = 4;
public final static int MAGE_VERSION_PATCH = 0;
- public final static String MAGE_VERSION_MINOR_PATCH = "";
+ public final static String MAGE_VERSION_MINOR_PATCH = "v0";
public final static String MAGE_VERSION_INFO = "";
private final int major;
diff --git a/Mage.Plugins/Mage.Counter.Plugin/pom.xml b/Mage.Plugins/Mage.Counter.Plugin/pom.xml
index e84b2d868b..a17a51e369 100644
--- a/Mage.Plugins/Mage.Counter.Plugin/pom.xml
+++ b/Mage.Plugins/Mage.Counter.Plugin/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-plugins
- 1.3.0
+ 1.4.0
mage-counter-plugin
diff --git a/Mage.Plugins/Mage.Theme.Plugin/pom.xml b/Mage.Plugins/Mage.Theme.Plugin/pom.xml
index 5acf5f7a22..e03b2cd956 100644
--- a/Mage.Plugins/Mage.Theme.Plugin/pom.xml
+++ b/Mage.Plugins/Mage.Theme.Plugin/pom.xml
@@ -6,7 +6,7 @@
org.mage
mage-plugins
- 1.3.0
+ 1.4.0
mage-theme-plugin
@@ -29,7 +29,7 @@
${project.groupId}
mage-client
- 1.3.0
+ 1.4.0
diff --git a/Mage.Plugins/pom.xml b/Mage.Plugins/pom.xml
index c523b4a225..082e3e6509 100644
--- a/Mage.Plugins/pom.xml
+++ b/Mage.Plugins/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-root
- 1.3.0
+ 1.4.0
mage-plugins
diff --git a/Mage.Server.Console/pom.xml b/Mage.Server.Console/pom.xml
index 157d81b8db..89711b9d91 100644
--- a/Mage.Server.Console/pom.xml
+++ b/Mage.Server.Console/pom.xml
@@ -6,7 +6,7 @@
org.mage
mage-root
- 1.3.0
+ 1.4.0
org.mage
diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml b/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml
index 2932500364..17ed6709e3 100644
--- a/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml
+++ b/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-server-plugins
- 1.3.0
+ 1.4.0
mage-deck-constructed
diff --git a/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml b/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml
index 13d9e80858..aaf2a0c6c0 100644
--- a/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml
+++ b/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-server-plugins
- 1.3.0
+ 1.4.0
mage-deck-limited
diff --git a/Mage.Server.Plugins/Mage.Game.CommanderDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.CommanderDuel/pom.xml
index 649d47dcac..198839d0f2 100644
--- a/Mage.Server.Plugins/Mage.Game.CommanderDuel/pom.xml
+++ b/Mage.Server.Plugins/Mage.Game.CommanderDuel/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-server-plugins
- 1.3.0
+ 1.4.0
mage-game-commanderduel
diff --git a/Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/pom.xml b/Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/pom.xml
index a7f06e82ae..d83276362c 100644
--- a/Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/pom.xml
+++ b/Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/pom.xml
@@ -6,7 +6,7 @@
org.mage
mage-server-plugins
- 1.3.0
+ 1.4.0
mage-game-commanderfreeforall
diff --git a/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml b/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml
index 0723962108..d44c53517b 100644
--- a/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml
+++ b/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-server-plugins
- 1.3.0
+ 1.4.0
mage-game-freeforall
diff --git a/Mage.Server.Plugins/Mage.Game.TinyLeadersDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.TinyLeadersDuel/pom.xml
index ccf6b733a0..3ed7020bf7 100644
--- a/Mage.Server.Plugins/Mage.Game.TinyLeadersDuel/pom.xml
+++ b/Mage.Server.Plugins/Mage.Game.TinyLeadersDuel/pom.xml
@@ -1,50 +1,50 @@
-
-
-
- 4.0.0
-
-
- org.mage
- mage-server-plugins
- 1.3.0
-
-
- mage-game-tinyleadersduel
- jar
- Mage Game Tiny Leaders Two Player
-
-
-
- ${project.groupId}
- mage
- ${project.version}
-
-
-
-
- src
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
-
- 1.7
-
-
-
- maven-resources-plugin
-
- UTF-8
-
-
-
-
-
- mage-game-tinyleadersduel
-
-
-
-
-
+
+
+
+ 4.0.0
+
+
+ org.mage
+ mage-server-plugins
+ 1.4.0
+
+
+ mage-game-tinyleadersduel
+ jar
+ Mage Game Tiny Leaders Two Player
+
+
+
+ ${project.groupId}
+ mage
+ ${project.version}
+
+
+
+
+ src
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+
+ 1.7
+
+
+
+ maven-resources-plugin
+
+ UTF-8
+
+
+
+
+
+ mage-game-tinyleadersduel
+
+
+
+
+
diff --git a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml
index 963ca435ee..fe7e465d17 100644
--- a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml
+++ b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-server-plugins
- 1.3.0
+ 1.4.0
mage-game-twoplayerduel
diff --git a/Mage.Server.Plugins/Mage.Player.AI.DraftBot/pom.xml b/Mage.Server.Plugins/Mage.Player.AI.DraftBot/pom.xml
index e47e6cb112..13e94e25e6 100644
--- a/Mage.Server.Plugins/Mage.Player.AI.DraftBot/pom.xml
+++ b/Mage.Server.Plugins/Mage.Player.AI.DraftBot/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-server-plugins
- 1.3.0
+ 1.4.0
mage-player-ai-draftbot
diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml b/Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml
index 3d47d7ce98..8bbe618537 100644
--- a/Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml
+++ b/Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-server-plugins
- 1.3.0
+ 1.4.0
mage-player-ai-ma
diff --git a/Mage.Server.Plugins/Mage.Player.AI/pom.xml b/Mage.Server.Plugins/Mage.Player.AI/pom.xml
index e63555e0ca..d4308dc2e4 100644
--- a/Mage.Server.Plugins/Mage.Player.AI/pom.xml
+++ b/Mage.Server.Plugins/Mage.Player.AI/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-server-plugins
- 1.3.0
+ 1.4.0
mage-player-ai
diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml b/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml
index aef5a8e5c7..86f8bf8099 100644
--- a/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml
+++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-server-plugins
- 1.3.0
+ 1.4.0
mage-player-ai-mcts
diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml b/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml
index 92e345663f..5223670dca 100644
--- a/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml
+++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-server-plugins
- 1.3.0
+ 1.4.0
mage-player-aiminimax
diff --git a/Mage.Server.Plugins/Mage.Player.Human/pom.xml b/Mage.Server.Plugins/Mage.Player.Human/pom.xml
index be6fb44290..9e7c35f9d9 100644
--- a/Mage.Server.Plugins/Mage.Player.Human/pom.xml
+++ b/Mage.Server.Plugins/Mage.Player.Human/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-server-plugins
- 1.3.0
+ 1.4.0
mage-player-human
diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml
index 8adb77fdbe..a54a82d6f5 100644
--- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml
+++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-server-plugins
- 1.3.0
+ 1.4.0
mage-tournament-boosterdraft
diff --git a/Mage.Server.Plugins/Mage.Tournament.Constructed/pom.xml b/Mage.Server.Plugins/Mage.Tournament.Constructed/pom.xml
index 121f2bc411..272aa4bdf8 100644
--- a/Mage.Server.Plugins/Mage.Tournament.Constructed/pom.xml
+++ b/Mage.Server.Plugins/Mage.Tournament.Constructed/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-server-plugins
- 1.3.0
+ 1.4.0
mage-tournament-constructed
diff --git a/Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml b/Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml
index d415f0104e..1727046d60 100644
--- a/Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml
+++ b/Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-server-plugins
- 1.3.0
+ 1.4.0
mage-tournament-sealed
diff --git a/Mage.Server.Plugins/pom.xml b/Mage.Server.Plugins/pom.xml
index 7176eca9d9..eb1522dccf 100644
--- a/Mage.Server.Plugins/pom.xml
+++ b/Mage.Server.Plugins/pom.xml
@@ -6,7 +6,7 @@
org.mage
mage-root
- 1.3.0
+ 1.4.0
mage-server-plugins
diff --git a/Mage.Server/pom.xml b/Mage.Server/pom.xml
index c4f3e58f13..8ca875326b 100644
--- a/Mage.Server/pom.xml
+++ b/Mage.Server/pom.xml
@@ -6,7 +6,7 @@
org.mage
mage-root
- 1.3.0
+ 1.4.0
mage-server
diff --git a/Mage.Server/server.msg.txt b/Mage.Server/server.msg.txt
index 6233d9a06e..17ea51ac05 100644
--- a/Mage.Server/server.msg.txt
+++ b/Mage.Server/server.msg.txt
@@ -2,5 +2,5 @@ HotKeys: Alt+E - Enlarge card image
Wheel zoom in/out - Enlarge card image
F4 - end current turn, response to stack
F9 - skip all opponents' turns, no response to stack
-Welcome! You are playing Mage version 1.3.0
+Welcome! You are playing Mage version 1.4.0
Contact us on www.slightlymagic.net
\ No newline at end of file
diff --git a/Mage.Sets/pom.xml b/Mage.Sets/pom.xml
index 3cd9889a2f..6974f845d0 100644
--- a/Mage.Sets/pom.xml
+++ b/Mage.Sets/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-root
- 1.3.0
+ 1.4.0
org.mage
diff --git a/Mage.Stats/pom.xml b/Mage.Stats/pom.xml
index 08d3b94612..99fed80daa 100644
--- a/Mage.Stats/pom.xml
+++ b/Mage.Stats/pom.xml
@@ -1,160 +1,160 @@
-
-
- 4.0.0
-
-
- org.mage
- mage-root
- 1.3.0
-
-
- org.mage
- mage-stats
- war
- XMage Stats Web Service
-
-
-
- JBoss repository
- https://repository.jboss.org/nexus/content/groups/public-jboss/
-
-
-
-
-
-
- org.mage
- mage-common
- ${project.version}
-
-
-
- org.mage
- mage-server
- ${project.version}
-
-
-
- junit
- junit
- test
-
-
-
- net.minidev
- json-smart
- 2.1.1
-
-
-
- org.aspectj
- aspectjrt
- 1.8.2
-
-
-
- net.sf.opencsv
- opencsv
- 2.3
-
-
-
-
- org.jboss.resteasy
- resteasy-jaxrs
- 2.3.7.Final
- provided
-
-
-
- ch.qos.logback
- logback-classic
- 1.1.2
-
-
-
- org.apache.sling
- org.apache.sling.commons.json
- 2.0.10
-
-
-
- org.jboss.resteasy
- resteasy-multipart-provider
- 2.3.1.GA
-
-
-
- commons-io
- commons-io
- 2.4
-
-
-
- commons-httpclient
- commons-httpclient
- 3.1
-
-
-
- javax.servlet
- servlet-api
- 2.5
-
-
-
- joda-time
- joda-time
- 2.7
-
-
-
-
- mage-stats-ws
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
-
- 1.7
-
-
-
- org.apache.maven.plugins
- maven-war-plugin
- 2.6
-
- src\main\webapp\WEB-INF\web.xml
- .
-
-
-
- org.codehaus.mojo
- aspectj-maven-plugin
- 1.7
-
-
-
-
- 1.6
-
-
-
-
- compile
-
-
-
-
-
-
-
-
- UTF-8
-
-
+
+
+ 4.0.0
+
+
+ org.mage
+ mage-root
+ 1.4.0
+
+
+ org.mage
+ mage-stats
+ war
+ XMage Stats Web Service
+
+
+
+ JBoss repository
+ https://repository.jboss.org/nexus/content/groups/public-jboss/
+
+
+
+
+
+
+ org.mage
+ mage-common
+ ${project.version}
+
+
+
+ org.mage
+ mage-server
+ ${project.version}
+
+
+
+ junit
+ junit
+ test
+
+
+
+ net.minidev
+ json-smart
+ 2.1.1
+
+
+
+ org.aspectj
+ aspectjrt
+ 1.8.2
+
+
+
+ net.sf.opencsv
+ opencsv
+ 2.3
+
+
+
+
+ org.jboss.resteasy
+ resteasy-jaxrs
+ 2.3.7.Final
+ provided
+
+
+
+ ch.qos.logback
+ logback-classic
+ 1.1.2
+
+
+
+ org.apache.sling
+ org.apache.sling.commons.json
+ 2.0.10
+
+
+
+ org.jboss.resteasy
+ resteasy-multipart-provider
+ 2.3.1.GA
+
+
+
+ commons-io
+ commons-io
+ 2.4
+
+
+
+ commons-httpclient
+ commons-httpclient
+ 3.1
+
+
+
+ javax.servlet
+ servlet-api
+ 2.5
+
+
+
+ joda-time
+ joda-time
+ 2.7
+
+
+
+
+ mage-stats-ws
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+
+ 1.7
+
+
+
+ org.apache.maven.plugins
+ maven-war-plugin
+ 2.6
+
+ src\main\webapp\WEB-INF\web.xml
+ .
+
+
+
+ org.codehaus.mojo
+ aspectj-maven-plugin
+ 1.7
+
+
+
+
+ 1.6
+
+
+
+
+ compile
+
+
+
+
+
+
+
+
+ UTF-8
+
+
diff --git a/Mage.Tests/pom.xml b/Mage.Tests/pom.xml
index 3e7e26d83e..8b5be68e06 100644
--- a/Mage.Tests/pom.xml
+++ b/Mage.Tests/pom.xml
@@ -6,7 +6,7 @@
org.mage
mage-root
- 1.3.0
+ 1.4.0
mage-tests
diff --git a/Mage.Updater/pom.xml b/Mage.Updater/pom.xml
index 9278cde20f..62b47116dc 100644
--- a/Mage.Updater/pom.xml
+++ b/Mage.Updater/pom.xml
@@ -5,7 +5,7 @@
mage-root
org.mage
- 1.3.0
+ 1.4.0
4.0.0
diff --git a/Mage/pom.xml b/Mage/pom.xml
index 4ec038a5e1..b29479975d 100644
--- a/Mage/pom.xml
+++ b/Mage/pom.xml
@@ -7,7 +7,7 @@
org.mage
mage-root
- 1.3.0
+ 1.4.0
mage
diff --git a/pom.xml b/pom.xml
index f024001d95..c0468ace04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
org.mage
mage-root
- 1.3.0
+ 1.4.0
pom
Mage Root
Mage Root POM
@@ -83,7 +83,7 @@
- 1.3.0
+ 1.4.0
UTF-8