ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Making sure that extra information is persisted in card collections

Browse Source
This commit is contained in:
marcin.sciesinski
2018-04-13 07:57:41 -07:00
parent ec01b99b3e
commit 63eb3e41be
3 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/draft2/builder/DraftChoiceBuilder.java
View File

@@ -146,11 +146,8 @@ public class DraftChoiceBuilder {
JSONArray switchResult = (JSONArray) data.get("switchResult");
final List<DraftChoiceDefinition> draftChoiceDefinitionList = new ArrayList<DraftChoiceDefinition>();
Iterator<JSONObject> switchResultIterator = switchResult.iterator();
while (switchResultIterator.hasNext()) {
JSONObject switchResultObject = switchResultIterator.next();
for (JSONObject switchResultObject : (Iterable<JSONObject>) switchResult)
draftChoiceDefinitionList.add(constructDraftChoiceDefinition(switchResultObject));
}
return new DraftChoiceDefinition() {
@Override

1
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/DefaultCardCollection.java
View File

@@ -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<String, Object> extraInformation) {

5
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/DraftLeagueData.java
View File

@@ -81,15 +81,10 @@ public class DraftLeagueData implements LeagueData {
if (currentTime >= _serie.getStart()) {
Map<Player, CardCollection> map = collectionsManager.getPlayersCollection(_collectionType.getCode());
for (Map.Entry<Player, CardCollection> playerCardCollectionEntry : map.entrySet()) {
MutableCardCollection startingCollection = new DefaultCardCollection();
Player player = playerCardCollectionEntry.getKey();
CardCollection leagueProduct = _draft.initializeNewCollection(getSeed(player));
for (Map.Entry<String, CardCollection.Item> 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;