diff --git a/src/main/java/forge/card/EditionCollection.java b/src/main/java/forge/card/EditionCollection.java index 8020fc0a93d..4d19384f21c 100644 --- a/src/main/java/forge/card/EditionCollection.java +++ b/src/main/java/forge/card/EditionCollection.java @@ -18,10 +18,13 @@ package forge.card; import java.io.File; +import java.util.Collections; +import java.util.List; import java.util.Map; import java.util.TreeMap; import com.google.common.base.Function; +import com.google.common.collect.Lists; import forge.util.IItemReader; import forge.util.storage.StorageView; @@ -54,6 +57,14 @@ public final class EditionCollection extends StorageView { CardEdition baseResult = super.get(code); return baseResult == null ? aliasToEdition.get(code) : baseResult; } + + + public Iterable getOrderedEditions() { + List res = Lists.newArrayList(this); + Collections.sort(res); + Collections.reverse(res); + return res; + } /** * Gets the sets by code or throw. diff --git a/src/main/java/forge/model/FModel.java b/src/main/java/forge/model/FModel.java index 0c1024eeb8b..9be8353b8ca 100644 --- a/src/main/java/forge/model/FModel.java +++ b/src/main/java/forge/model/FModel.java @@ -146,7 +146,7 @@ public enum FModel { FThreads.assertExecutedByEdt(false); final CardStorageReader reader = new CardStorageReader(NewConstants.CARD_DATA_DIR, true); // this fills in our map of card names to Card instances. - CardDb.setup(reader.loadCards(), editions); + CardDb.setup(reader.loadCards(), editions.getOrderedEditions()); this.formats = new FormatCollection("res/blockdata/formats.txt");