diff --git a/src/forge/deck/generate/GenerateConstructedDeck.java b/src/forge/deck/generate/GenerateConstructedDeck.java index 9e977df6e34..4e1032d3ab3 100644 --- a/src/forge/deck/generate/GenerateConstructedDeck.java +++ b/src/forge/deck/generate/GenerateConstructedDeck.java @@ -96,8 +96,8 @@ public class GenerateConstructedDeck color2 = Constant.Color.onlyColors[b]; CardList out = new CardList(); - out.addAll(CardListUtil.getColor(in, color1).toArray()); - out.addAll(CardListUtil.getColor(in, color2).toArray()); + out.addAll(CardListUtil.getColor(in, color1)); + out.addAll(CardListUtil.getColor(in, color2)); out.shuffle(); CardList artifact = in.filter(new CardListFilter() @@ -111,7 +111,7 @@ public class GenerateConstructedDeck !Gui_NewGame.removeArtifacts.isSelected(); } }); - out.addAll(artifact.toArray()); + out.addAll(artifact); out = out.filter(new CardListFilter() { diff --git a/src/forge/deck/generate/GenerateConstructedMultiColorDeck.java b/src/forge/deck/generate/GenerateConstructedMultiColorDeck.java index 25c45944aa3..16e91207082 100644 --- a/src/forge/deck/generate/GenerateConstructedMultiColorDeck.java +++ b/src/forge/deck/generate/GenerateConstructedMultiColorDeck.java @@ -260,9 +260,9 @@ public class GenerateConstructedMultiColorDeck color3 = Constant.Color.onlyColors[c]; CardList out = new CardList(); - out.addAll(CardListUtil.getColor(in, color1).toArray()); - out.addAll(CardListUtil.getColor(in, color2).toArray()); - out.addAll(CardListUtil.getColor(in, color3).toArray()); + out.addAll(CardListUtil.getColor(in, color1)); + out.addAll(CardListUtil.getColor(in, color2)); + out.addAll(CardListUtil.getColor(in, color3)); out.shuffle(); CardList artifact = in.filter(new CardListFilter() @@ -276,7 +276,7 @@ public class GenerateConstructedMultiColorDeck !Gui_NewGame.removeArtifacts.isSelected(); } }); - out.addAll(artifact.toArray()); + out.addAll(artifact); out = out.filter(new CardListFilter() { @@ -308,13 +308,13 @@ public class GenerateConstructedMultiColorDeck CardList out = new CardList(); /* - out.addAll(CardListUtil.getColor(in, color1).toArray()); - out.addAll(CardListUtil.getColor(in, color2).toArray()); - out.addAll(CardListUtil.getColor(in, color3).toArray()); - out.addAll(CardListUtil.getColor(in, color4).toArray()); - out.addAll(CardListUtil.getColor(in, color5).toArray()); + out.addAll(CardListUtil.getColor(in, color1)); + out.addAll(CardListUtil.getColor(in, color2)); + out.addAll(CardListUtil.getColor(in, color3)); + out.addAll(CardListUtil.getColor(in, color4)); + out.addAll(CardListUtil.getColor(in, color5)); */ - out.addAll(CardListUtil.getGoldCards(in).toArray()); + out.addAll(CardListUtil.getGoldCards(in)); out.shuffle(); CardList artifact = in.filter(new CardListFilter() @@ -328,7 +328,7 @@ public class GenerateConstructedMultiColorDeck !Gui_NewGame.removeArtifacts.isSelected(); } }); - out.addAll(artifact.toArray()); + out.addAll(artifact); out = out.filter(new CardListFilter() { diff --git a/src/forge/deck/generate/GenerateSealedDeck.java b/src/forge/deck/generate/GenerateSealedDeck.java index caf948c6d18..3656ecf356d 100644 --- a/src/forge/deck/generate/GenerateSealedDeck.java +++ b/src/forge/deck/generate/GenerateSealedDeck.java @@ -88,8 +88,8 @@ public class GenerateSealedDeck color2 = Constant.Color.onlyColors[b]; CardList out = new CardList(); - out.addAll(CardListUtil.getColor(in, color1).toArray()); - out.addAll(CardListUtil.getColor(in, color2).toArray()); + out.addAll(CardListUtil.getColor(in, color1)); + out.addAll(CardListUtil.getColor(in, color2)); CardList artifact = in.filter(new CardListFilter() { @@ -102,7 +102,7 @@ public class GenerateSealedDeck !Gui_NewGame.removeArtifacts.isSelected(); } }); - out.addAll(artifact.toArray()); + out.addAll(artifact); out = out.filter(new CardListFilter() {