Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Added option that AbilityPicker is forced to show if ability or spell has no or only tap cost (not finished yet).

Browse source
This commit is contained in:
LevelX2 2014-02-12 17:18:06 +01:00
parent 81eaac46c7
commit ee76ccfee4
14 changed files with 194 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -190,7 +190,7 @@ public class SessionImpl implements Session {
this.sessionId = callbackClient.getSessionId();
boolean registerResult;
if (connection.getPassword() == null) {
UserDataView userDataView = new UserDataView(connection.getAvatarId());
UserDataView userDataView = new UserDataView(connection.getAvatarId(), connection.isShowAbilityPickerForced());
// for backward compatibility. don't remove twice call - first one does nothing but for version checking
registerResult = server.registerClient(connection.getUsername(), sessionId, client.getVersion());
server.setUserData(connection.getUsername(), sessionId, userDataView);
@ -367,8 +367,6 @@ public class SessionImpl implements Session {
}
} catch (MageException ex) {
handleMageException(ex);
} catch (Throwable t) {
handleThrowable(t);
}
return null;
}
@ -381,8 +379,6 @@ public class SessionImpl implements Session {
}
} catch (MageException ex) {
handleMageException(ex);
} catch (Throwable t) {
handleThrowable(t);
}
return null;
}
@ -395,8 +391,6 @@ public class SessionImpl implements Session {
}
} catch (MageException ex) {
handleMageException(ex);
} catch (Throwable t) {
handleThrowable(t);
}
return null;
}
@ -423,8 +417,6 @@ public class SessionImpl implements Session {
}
} catch (MageException ex) {
handleMageException(ex);
} catch (Throwable t) {
handleThrowable(t);
}
return null;
}
@ -1243,10 +1235,10 @@ public class SessionImpl implements Session {
}
@Override
public boolean updateAvatar(int avatarId) {
public boolean updatePreferencesForServer(int avatarId, boolean showAbilityPickerForced) {
try {
if (isConnected()) {
UserDataView userDataView = new UserDataView(avatarId);
UserDataView userDataView = new UserDataView(avatarId, showAbilityPickerForced);
server.setUserData(connection.getUsername(), sessionId, userDataView);
}
return true;