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

Fixing issues with solo-drafts losing collections

Browse Source
This commit is contained in:
marcin.sciesinski
2018-09-12 19:36:57 -07:00
parent 572c0a6d5b
commit 5d5949633a
1 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SoloDraftLeagueData.java
View File

@@ -65,12 +65,11 @@ public class SoloDraftLeagueData implements LeagueData {
public CardCollection joinLeague(CollectionsManager collectionsManager, Player player, int currentTime) { public CardCollection joinLeague(CollectionsManager collectionsManager, Player player, int currentTime) {
MutableCardCollection startingCollection = new DefaultCardCollection(); MutableCardCollection startingCollection = new DefaultCardCollection();
long seed = getSeed(player); long seed = getSeed(player);
if (currentTime >= _serie.getStart()) {
CardCollection leagueProduct = _draft.initializeNewCollection(seed);
for (Map.Entry<String, CardCollection.Item> serieCollectionItem : leagueProduct.getAll().entrySet()) CardCollection leagueProduct = _draft.initializeNewCollection(seed);
startingCollection.addItem(serieCollectionItem.getKey(), serieCollectionItem.getValue().getCount());
} for (Map.Entry<String, CardCollection.Item> serieCollectionItem : leagueProduct.getAll().entrySet())
startingCollection.addItem(serieCollectionItem.getKey(), serieCollectionItem.getValue().getCount());
startingCollection.setExtraInformation(createExtraInformation(seed)); startingCollection.setExtraInformation(createExtraInformation(seed));
collectionsManager.addPlayerCollection(false, "Sealed league product", player, _collectionType, startingCollection); collectionsManager.addPlayerCollection(false, "Sealed league product", player, _collectionType, startingCollection);
@@ -90,23 +89,9 @@ public class SoloDraftLeagueData implements LeagueData {
int status = oldStatus; int status = oldStatus;
if (status == 0) { if (status == 0) {
if (currentTime >= _serie.getStart()) {
Map<Player, CardCollection> map = collectionsManager.getPlayersCollection(_collectionType.getCode());
for (Map.Entry<Player, CardCollection> playerCardCollectionEntry : map.entrySet()) {
Player player = playerCardCollectionEntry.getKey();
CardCollection leagueProduct = _draft.initializeNewCollection(getSeed(player));
collectionsManager.addItemsToPlayerCollection(false, "New sealed league product", player, _collectionType, leagueProduct.getAll().values());
}
status = 1;
}
}
int maxGamesTotal = _serie.getMaxMatches();
if (status == 1) {
if (currentTime > DateUtils.offsetDate(_serie.getEnd(), 1)) { if (currentTime > DateUtils.offsetDate(_serie.getEnd(), 1)) {
int maxGamesTotal = _serie.getMaxMatches();
for (PlayerStanding leagueStanding : leagueStandings) { for (PlayerStanding leagueStanding : leagueStandings) {
CardCollection leaguePrize = _leaguePrizes.getPrizeForLeague(leagueStanding.getStanding(), leagueStandings.size(), leagueStanding.getGamesPlayed(), maxGamesTotal, _collectionType); CardCollection leaguePrize = _leaguePrizes.getPrizeForLeague(leagueStanding.getStanding(), leagueStandings.size(), leagueStanding.getGamesPlayed(), maxGamesTotal, _collectionType);
if (leaguePrize != null) if (leaguePrize != null)