external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'editions-type-review' into 'master'

Browse Source 
ReNEWED Edition Types and Dates for Card Edition, ReNewed `Set` filter dialog panel in Desktop, NEW `Blocks` Card|Deck Catalog Filter, Updates to Formats

See merge request core-developers/forge!4878
This commit is contained in:
Michael Kamensky
2021-07-06 04:23:24 +00:00
parent ae32a9f27b 921fc43f75
commit 251ffbf574
384 changed files with 1958 additions and 994 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
forge-gui/src/main/java/forge/gamemodes/quest/QuestWorld.java
View File

@@ -231,15 +231,10 @@ public class QuestWorld implements Comparable<QuestWorld>{
*/
@Override
public int compareTo(QuestWorld other) {
if (null == other) {
if (null == other)
return 1;
}
if (name == other.name) {
return 0;
}
if (null == name) {
return -1;
}
if (this.name == null)
return -1; // dummy, no format!
return name.compareTo(other.name);
}

2
forge-gui/src/main/java/forge/gamemodes/quest/data/GameFormatQuest.java
View File

@@ -64,7 +64,7 @@ public final class GameFormatQuest extends GameFormat {
public GameFormatQuest(final GameFormat toCopy, boolean allowSetUnlocks) {
super(toCopy.getName(), toCopy.getEffectiveDate(), toCopy.getAllowedSetCodes(), toCopy.getBannedCardNames(), toCopy.getRestrictedCards(),
toCopy.isRestrictedLegendary(),toCopy.getAdditionalCards(), toCopy.getAllowedRarities(),
toCopy.getIndex(), FormatType.Custom, FormatSubType.Custom);
toCopy.getIndex(), FormatType.CUSTOM, FormatSubType.CUSTOM);
allowUnlocks = allowSetUnlocks;
}