From ef570f450dffba447a7862823717c43047f292b5 Mon Sep 17 00:00:00 2001 From: Sol Date: Mon, 19 Sep 2016 03:35:28 +0000 Subject: [PATCH] - When getting all formats of a deck, don't change the order of the formats but sticking it into an unordered set. --- forge-game/src/main/java/forge/game/GameFormat.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/forge-game/src/main/java/forge/game/GameFormat.java b/forge-game/src/main/java/forge/game/GameFormat.java index 37b87e8eb3f..28e0fe3ba2d 100644 --- a/forge-game/src/main/java/forge/game/GameFormat.java +++ b/forge-game/src/main/java/forge/game/GameFormat.java @@ -35,13 +35,8 @@ import forge.util.storage.StorageBase; import forge.util.storage.StorageReaderFileSections; import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; +import java.util.*; import java.util.Map.Entry; -import java.util.Set; public class GameFormat implements Comparable { @@ -73,7 +68,7 @@ public class GameFormat implements Comparable { allowedSetCodes = sets == null ? new ArrayList() : Lists.newArrayList(sets); bannedCardNames = bannedCards == null ? new ArrayList() : Lists.newArrayList(bannedCards); restrictedCardNames = restrictedCards == null ? new ArrayList() : Lists.newArrayList(restrictedCards); - + this.allowedSetCodes_ro = Collections.unmodifiableList(allowedSetCodes); this.bannedCardNames_ro = Collections.unmodifiableList(bannedCardNames); this.restrictedCardNames_ro = Collections.unmodifiableList(restrictedCardNames); @@ -273,7 +268,7 @@ public class GameFormat implements Comparable { } public Set getAllFormatsOfDeck(Deck deck) { - Set result = new HashSet(); + SortedSet result = new TreeSet(); CardPool allCards = deck.getAllCardsInASinglePool(); for(GameFormat gf : naturallyOrdered) { if (gf.isPoolLegal(allCards)) {