diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft2/builder/DraftChoiceBuilder.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft2/builder/DraftChoiceBuilder.java index 8bd86c591..83c333dd3 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft2/builder/DraftChoiceBuilder.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft2/builder/DraftChoiceBuilder.java @@ -146,11 +146,8 @@ public class DraftChoiceBuilder { JSONArray switchResult = (JSONArray) data.get("switchResult"); final List draftChoiceDefinitionList = new ArrayList(); - Iterator switchResultIterator = switchResult.iterator(); - while (switchResultIterator.hasNext()) { - JSONObject switchResultObject = switchResultIterator.next(); + for (JSONObject switchResultObject : (Iterable) switchResult) draftChoiceDefinitionList.add(constructDraftChoiceDefinition(switchResultObject)); - } return new DraftChoiceDefinition() { @Override 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 59e28da19..c668ab86c 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 @@ -18,6 +18,7 @@ public class DefaultCardCollection implements MutableCardCollection { _counts.putAll(cardCollection.getAll()); _basicItems.addAll(cardCollection.getAllCardsInCollection()); _currency = cardCollection.getCurrency(); + _extraInformation.putAll(cardCollection.getExtraInformation()); } public synchronized void setExtraInformation(Map extraInformation) { diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/DraftLeagueData.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/DraftLeagueData.java index 8a4741efb..753f33531 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/DraftLeagueData.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/DraftLeagueData.java @@ -81,15 +81,10 @@ public class DraftLeagueData implements LeagueData { if (currentTime >= _serie.getStart()) { Map map = collectionsManager.getPlayersCollection(_collectionType.getCode()); for (Map.Entry playerCardCollectionEntry : map.entrySet()) { - MutableCardCollection startingCollection = new DefaultCardCollection(); Player player = playerCardCollectionEntry.getKey(); CardCollection leagueProduct = _draft.initializeNewCollection(getSeed(player)); - for (Map.Entry serieCollectionItem : leagueProduct.getAll().entrySet()) - startingCollection.addItem(serieCollectionItem.getKey(), serieCollectionItem.getValue().getCount()); - - startingCollection.setExtraInformation(createExtraInformation()); collectionsManager.addItemsToPlayerCollection(false, "New sealed league product", player, _collectionType, leagueProduct.getAll().values()); } status = 1;