* Finished changes for new preference option to force showing ability picker for 0 mana spells or abilities with only tap costs.

This commit is contained in:
LevelX2 2014-02-12 20:52:33 +01:00
parent ee76ccfee4
commit 67e25d43bd
7 changed files with 28 additions and 14 deletions

View file

@ -120,9 +120,14 @@ public class Session {
public boolean setUserData(String userName, UserDataView userDataView) {
User user = UserManager.getInstance().findUser(userName);
if (user != null) {
UserData userData = new UserData(UserGroup.PLAYER, userDataView.getAvatarId(), userDataView.isShowAbilityPickerForced());
updateAvatar(userName, userData);
user.setUserData(userData);
UserData userData = user.getUserData();
if (userData == null) {
userData = new UserData(UserGroup.PLAYER, userDataView.getAvatarId(), userDataView.isShowAbilityPickerForced());
user.setUserData(userData);
} else {
userData.setAvatarId(userDataView.getAvatarId());
userData.setShowAbilityPickerForced(userDataView.isShowAbilityPickerForced());
}
return true;
}
return false;