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

Merge branch 'master' into Network_Upgrade

Browse source 
Conflicts:
	Mage.Client/src/main/java/mage/client/chat/ChatPanel.java
	Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
	Mage.Client/src/main/java/mage/client/table/TablesPanel.java
	Mage.Common/src/mage/remote/SessionImpl.java
	Mage.Server/src/main/java/mage/server/Session.java
This commit is contained in:
betasteward 2015-06-20 23:00:34 -04:00
commit f4aff4a121
894 changed files with 23817 additions and 4981 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Server/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
</parent>
<artifactId>mage-server</artifactId>

4
Mage.Server/release/server.msg.txt
View file

@ -1,4 +1,4 @@
Welcome! You are playing XMage version 1.3.0
Welcome! You are playing XMage version 1.4.1
Find what was changed since previous versions on project Wiki https://github.com/magefree/mage/wiki
Contact us on the XMAGE board of http://www.slightlymagic.net/forum/viewforum.php?f=70 for bug reports or enhancement requests.
Download newest version from http://XMage.info.
Download newest version from http://XMage.de

2
Mage.Server/server.msg.txt
View file

@ -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.4.0
Welcome! You are playing Mage version 1.4.1
Contact us on www.slightlymagic.net

29
Mage.Server/src/main/java/mage/server/Session.java
View file

@ -140,7 +140,7 @@ public class Session {
}
this.userId = user.getId();
setUserData(user, connection);
setUserData(user, connection.getUserData());
if (reconnect) { // must be connected to receive the message
UUID chatId = GamesRoomManager.getInstance().getRoom(GamesRoomManager.getInstance().getMainRoomId()).getChatId();
@ -158,32 +158,33 @@ public class Session {
if (user == null) {
user = UserManager.getInstance().findUser("Admin");
}
user.setUserData(new UserData(UserGroup.ADMIN, 0, false, false, false, null, "world.png"));
user.setUserData(new UserData(UserGroup.ADMIN, 0, false, false, false, null, "world.png", false));
if (!UserManager.getInstance().connectToSession(sessionId, user.getId())) {
logger.info("Error connecting Admin!");
}
this.userId = user.getId();
}
public boolean setUserData(User user, Connection connection) {
public boolean setUserData(User user, UserDataView userDataView) {
// User user = UserManager.getInstance().findUser(userName);
if (user != null) {
UserData userData = user.getUserData();
if (userData == null) {
userData = new UserData(UserGroup.PLAYER, connection.getAvatarId(),
connection.isShowAbilityPickerForced(), connection.allowRequestShowHandCards(),
connection.confirmEmptyManaPool(), connection.getUserSkipPrioritySteps(),
connection.getFlagName());
userData = new UserData(UserGroup.PLAYER, userDataView.getAvatarId(),
userDataView.isShowAbilityPickerForced(), userDataView.allowRequestShowHandCards(),
userDataView.confirmEmptyManaPool(), userDataView.getUserSkipPrioritySteps(),
userDataView.getFlagName(), userDataView.askMoveToGraveOrder());
user.setUserData(userData);
} else {
if (connection.getAvatarId() == 51) { // Update special avatar if first avatar is selected
updateAvatar(connection.getUsername(), userData);
if (userData.getAvatarId() == 51) { // Update special avatar if first avatar is selected
updateAvatar(user.getName(), userData);
}
userData.setAvatarId(connection.getAvatarId());
userData.setShowAbilityPickerForced(connection.isShowAbilityPickerForced());
userData.setAllowRequestShowHandCards(connection.allowRequestShowHandCards());
userData.setUserSkipPrioritySteps(connection.getUserSkipPrioritySteps());
userData.setConfirmEmptyManaPool(connection.confirmEmptyManaPool());
userData.setAvatarId(userDataView.getAvatarId());
userData.setShowAbilityPickerForced(userDataView.isShowAbilityPickerForced());
userData.setAllowRequestShowHandCards(userDataView.allowRequestShowHandCards());
userData.setUserSkipPrioritySteps(userDataView.getUserSkipPrioritySteps());
userData.setConfirmEmptyManaPool(userDataView.confirmEmptyManaPool());
userData.setAskMoveToGraveOrder(userDataView.askMoveToGraveOrder());
}
return true;
}

4
Mage.Server/src/main/java/mage/server/game/GameController.java
View file

@ -605,8 +605,8 @@ public class GameController implements GameCallback {
if (grantingPlayer.isHuman()) {
GameSessionPlayer gameSession = gameSessions.get(userIdGranter);
if (gameSession != null) {
UUID requestingPlayer = getPlayerId(userIdRequester);
if (requestingPlayer == null || !requestingPlayer.equals(grantingPlayer.getId())) { // don't allow request for your own cards
UUID requestingPlayerId = getPlayerId(userIdRequester);
if (requestingPlayerId == null || !requestingPlayerId.equals(grantingPlayer.getId())) { // don't allow request for your own cards
if (grantingPlayer.isRequestToShowHandCardsAllowed()) {
gameSession.requestPermissionToSeeHandCards(userIdRequester);
} else {