External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-21 11:02:00 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

XMage 1.4.17V0

Browse source
This commit is contained in:
LevelX2 2016-10-23 10:03:01 +02:00
parent b2bd7f5e24
commit 8b62eece68
43 changed files with 182 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Common/src/mage/interfaces/MageServer.java
View file

@ -79,7 +79,7 @@ public interface MageServer {
List<CardInfo> getMissingCardsData(List<String> classNames);
// user methods
boolean setUserData(String userName, String sessionId, UserData userData) throws MageException;
boolean setUserData(String userName, String sessionId, UserData userData, String clientVersion) throws MageException;
void sendFeedbackMessage(String sessionId, String username, String title, String type, String message, String email) throws MageException;

4
Mage.Common/src/mage/remote/SessionImpl.java
View file

@ -223,7 +223,7 @@ public class SessionImpl implements Session {
// for backward compatibility. don't remove twice call - first one does nothing but for version checking
registerResult = server.connectUser(connection.getUsername(), connection.getPassword(), sessionId, client.getVersion());
if (registerResult) {
server.setUserData(connection.getUsername(), sessionId, connection.getUserData());
server.setUserData(connection.getUsername(), sessionId, connection.getUserData(), client.getVersion().toString());
}
} else {
registerResult = server.connectAdmin(connection.getAdminPassword(), sessionId, client.getVersion());
@ -1544,7 +1544,7 @@ public class SessionImpl implements Session {
public boolean updatePreferencesForServer(UserData userData) {
try {
if (isConnected()) {
server.setUserData(connection.getUsername(), sessionId, userData);
server.setUserData(connection.getUsername(), sessionId, userData, null);
}
return true;
} catch (MageException ex) {

4
Mage.Common/src/mage/utils/MageVersion.java
View file

@ -40,8 +40,8 @@ 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 = 16;
public final static String MAGE_VERSION_MINOR_PATCH = "v4";
public final static int MAGE_VERSION_PATCH = 17;
public final static String MAGE_VERSION_MINOR_PATCH = "V0";
public final static String MAGE_VERSION_INFO = "";
private final int major;

16
Mage.Common/src/mage/view/UserView.java
View file

@ -44,8 +44,9 @@ public class UserView implements Serializable {
private final String gameInfo;
private final String userState;
private final Date muteChatUntil;
private final String clientVersion;
public UserView(String userName, String host, String sessionId, Date timeConnected, String gameInfo, String userState, Date muteChatUntil) {
public UserView(String userName, String host, String sessionId, Date timeConnected, String gameInfo, String userState, Date muteChatUntil, String clientVersion) {
this.userName = userName;
this.host = host;
this.sessionId = sessionId;
@ -53,6 +54,7 @@ public class UserView implements Serializable {
this.gameInfo = gameInfo;
this.userState = userState;
this.muteChatUntil = muteChatUntil;
this.clientVersion = clientVersion;
}
public String getUserName() {
@ -67,10 +69,6 @@ public class UserView implements Serializable {
return sessionId;
}
public Date getConnectionTime() {
return timeConnected;
}
public String getGameInfo() {
return gameInfo;
}
@ -83,4 +81,12 @@ public class UserView implements Serializable {
return muteChatUntil;
}
public String getClientVersion() {
return clientVersion;
}
public Date getTimeConnected() {
return timeConnected;
}
}