diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/PacksStorageBuilder.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/PacksStorageBuilder.java index 2250a3384..95085e76d 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/PacksStorageBuilder.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/PacksStorageBuilder.java @@ -97,6 +97,21 @@ public class PacksStorageBuilder { packStorage.addPackBox("Special-08", new FixedPackBox("Special-08")); packStorage.addPackBox("Special-09", new FixedPackBox("Special-09")); + packStorage.addPackBox("(S)TSSealed-S1", new FixedPackBox("(S)TSSealed-S1")); + packStorage.addPackBox("TSSealedS1D1", new FixedPackBox("TSSealedS1D1")); + packStorage.addPackBox("TSSealedS1D2", new FixedPackBox("TSSealedS1D2")); + packStorage.addPackBox("TSSealedS1D3", new FixedPackBox("TSSealedS1D3")); + + packStorage.addPackBox("(S)TSSealed-S2", new FixedPackBox("(S)TSSealed-S2")); + packStorage.addPackBox("TSSealedS2D1", new FixedPackBox("TSSealedS2D1")); + packStorage.addPackBox("TSSealedS2D2", new FixedPackBox("TSSealedS2D2")); + packStorage.addPackBox("TSSealedS2D3", new FixedPackBox("TSSealedS2D3")); + + packStorage.addPackBox("(S)TSSealed-S3", new FixedPackBox("(S)TSSealed-S3")); + packStorage.addPackBox("TSSealedS3D1", new FixedPackBox("TSSealedS3D1")); + packStorage.addPackBox("TSSealedS3D2", new FixedPackBox("TSSealedS3D2")); + packStorage.addPackBox("TSSealedS3D3", new FixedPackBox("TSSealedS3D3")); + packStorage.addPackBox("FotR - Booster", new RarityPackBox(cardSets.getSetDefinitions().get("1"))); packStorage.addPackBox("MoM - Booster", new RarityPackBox(cardSets.getSetDefinitions().get("2"))); packStorage.addPackBox("RotEL - Booster", new RarityPackBox(cardSets.getSetDefinitions().get("3"))); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/DefaultCardCollection.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/DefaultCardCollection.java index 80e1878de..21a2133a7 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/DefaultCardCollection.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/DefaultCardCollection.java @@ -2,7 +2,13 @@ package com.gempukku.lotro.game; import com.gempukku.lotro.packs.PacksStorage; -import java.util.*; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; public class DefaultCardCollection implements MutableCardCollection { private Map _counts = new LinkedHashMap(); @@ -76,8 +82,8 @@ public class DefaultCardCollection implements MutableCardCollection { return null; if (count.getCount() > 0) { List packContents = null; - if (selection != null && packId.startsWith("(S)")) { - if (hasSelection(packId, selection, packsStorage)) { + if (packId.startsWith("(S)")) { + if (selection != null && hasSelection(packId, selection, packsStorage)) { packContents = new LinkedList(); packContents.add(Item.createItem(selection, 1)); }