From f72ddf5582e8243e8830ce4f0d312e5c5ba722d4 Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Wed, 16 May 2018 11:57:53 -0700 Subject: [PATCH] Starting collection is given immediately --- .../lotro/league/SoloDraftLeagueData.java | 25 ++++--------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SoloDraftLeagueData.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SoloDraftLeagueData.java index 447e88d0c..52fbb4a2f 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SoloDraftLeagueData.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SoloDraftLeagueData.java @@ -64,12 +64,11 @@ public class SoloDraftLeagueData implements LeagueData { public CardCollection joinLeague(CollectionsManager collectionsManager, Player player, int currentTime) { MutableCardCollection startingCollection = new DefaultCardCollection(); long seed = getSeed(player); - if (currentTime >= _serie.getStart()) { - CardCollection leagueProduct = _draft.initializeNewCollection(seed); - for (Map.Entry serieCollectionItem : leagueProduct.getAll().entrySet()) - startingCollection.addItem(serieCollectionItem.getKey(), serieCollectionItem.getValue().getCount()); - } + CardCollection leagueProduct = _draft.initializeNewCollection(seed); + + for (Map.Entry serieCollectionItem : leagueProduct.getAll().entrySet()) + startingCollection.addItem(serieCollectionItem.getKey(), serieCollectionItem.getValue().getCount()); startingCollection.setExtraInformation(createExtraInformation(seed)); collectionsManager.addPlayerCollection(false, "Sealed league product", player, _collectionType, startingCollection); @@ -88,23 +87,9 @@ public class SoloDraftLeagueData implements LeagueData { public int process(CollectionsManager collectionsManager, List leagueStandings, int oldStatus, int currentTime) { int status = oldStatus; - if (status == 0) { - if (currentTime >= _serie.getStart()) { - Map map = collectionsManager.getPlayersCollection(_collectionType.getCode()); - for (Map.Entry 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 (status == 0) { if (currentTime > DateUtils.offsetDate(_serie.getEnd(), 1)) { for (PlayerStanding leagueStanding : leagueStandings) { CardCollection leaguePrize = _leaguePrizes.getPrizeForLeague(leagueStanding.getStanding(), leagueStandings.size(), leagueStanding.getGamesPlayed(), maxGamesTotal, _collectionType);