Skip to content

CardEdition: cleanup Constructor #9569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hanmac merged 1 commit into from
Jan 19, 2026
Merged

CardEdition: cleanup Constructor #9569

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 4 additions & 15 deletions forge-core/src/main/java/forge/card/CardEdition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ public String getScriptOverride() {
*/
public static final String UNKNOWN_CODE = "???";
public static final String UNKNOWN_SET_NAME = "UNKNOWN";
public static final CardEdition UNKNOWN = new CardEdition("1990-01-01", UNKNOWN_CODE, "??", Type.UNKNOWN, UNKNOWN_SET_NAME, FoilType.NOT_SUPPORTED, new EditionEntry[]{});
public static final CardEdition UNKNOWN = new CardEdition("1990-01-01", UNKNOWN_CODE, "??", Type.UNKNOWN, UNKNOWN_SET_NAME, FoilType.NOT_SUPPORTED);
private Date date;
private String code;
private String code2;
Expand Down Expand Up @@ -332,16 +332,6 @@ private CardEdition(ListMultimap<String, EditionEntry> cardMap, ListMultimap<Str
this.customPrintSheetsToParse = customPrintSheetsToParse;
}

private CardEdition(EditionEntry[] cards, ListMultimap<String, EditionEntry> tokens) {
List<EditionEntry> cardsList = Arrays.asList(cards);
this.cardMap = ArrayListMultimap.create();
this.cardMap.replaceValues("cards", cardsList);
this.cardsInSet = new ArrayList<>(cardsList);
Collections.sort(cardsInSet);
this.tokenMap = tokens;
this.customPrintSheetsToParse = new HashMap<>();
}

/**
* Instantiates a new card set.
*
Expand All @@ -355,8 +345,8 @@ private CardEdition(EditionEntry[] cards, ListMultimap<String, EditionEntry> tok
* @param name the name of the set
* @param cards the cards in the set
*/
private CardEdition(String date, String code, String code2, Type type, String name, FoilType foil, EditionEntry[] cards) {
this(cards, ArrayListMultimap.create());
private CardEdition(String date, String code, String code2, Type type, String name, FoilType foil) {
this(ArrayListMultimap.create(), ArrayListMultimap.create(), new HashMap<>());
this.code = code;
this.code2 = code2;
this.type = type;
Expand Down Expand Up @@ -916,8 +906,7 @@ public void append(CardEdition.Collection C){ //Append custom editions
this.add(E);
initAliases(E); //Made a method in case the system changes, so it's consistent.
}
CardEdition customBucket = new CardEdition("2990-01-01", "USER", "USER",
Type.CUSTOM_SET, "USER", FoilType.NOT_SUPPORTED, new EditionEntry[]{});
CardEdition customBucket = new CardEdition("2990-01-01", "USER", "USER", Type.CUSTOM_SET, "USER", FoilType.NOT_SUPPORTED);
this.add(customBucket);
initAliases(customBucket);
this.lock = true; //Consider it initialized and prevent from writing any more data.
Expand Down