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 pull request #1505 from menocar/user-pane

Browse source 
Split History column into Matches and Tourneys columns.
This commit is contained in:
LevelX2 2016-01-31 12:49:00 +01:00
commit 75f5a17135
5 changed files with 91 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Mage/src/main/java/mage/players/net/UserData.java
View file

@ -23,7 +23,8 @@ public class UserData implements Serializable {
protected boolean passPriorityActivation;
protected boolean autoOrderTrigger;
protected String history;
protected String matchHistory;
protected String tourneyHistory;
public UserData(UserGroup userGroup, int avatarId, boolean showAbilityPickerForced,
boolean allowRequestShowHandCards, boolean confirmEmptyManaPool, UserSkipPrioritySteps userSkipPrioritySteps,
@ -42,7 +43,8 @@ public class UserData implements Serializable {
this.passPriorityCast = passPriorityCast;
this.passPriorityActivation = passPriorityActivation;
this.autoOrderTrigger = autoOrderTrigger;
this.history = "";
this.matchHistory = "";
this.tourneyHistory = "";
}
public void update(UserData userData) {
@ -169,12 +171,20 @@ public class UserData implements Serializable {
this.autoOrderTrigger = autoOrderTrigger;
}
public void setHistory(String history) {
this.history = history;
public void setMatchHistory(String history) {
this.matchHistory = history;
}
public String getHistory() {
return history;
public String getMatchHistory() {
return matchHistory;
}
public void setTourneyHistory(String history) {
this.tourneyHistory = history;
}
public String getTourneyHistory() {
return tourneyHistory;
}
public static String getDefaultFlagName() {