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:26:53 -07:00
parent bf499242e4
commit 572c0a6d5b
27 changed files with 122 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/LotroHttpRequestHandler.java
View File

@@ -74,7 +74,7 @@ public class LotroHttpRequestHandler extends SimpleChannelUpstreamHandler {
}
public void printLog(int statusCode, long finishedTime) {
_accesslog.debug(remoteIp+","+statusCode+","+uri+","+(finishedTime-requestTime));
_accesslog.debug(remoteIp + "," + statusCode + "," + uri + "," + (finishedTime - requestTime));
}
}
@@ -138,8 +138,9 @@ public class LotroHttpRequestHandler extends SimpleChannelUpstreamHandler {
try {
String ipAddress = ((InetSocketAddress) e.getRemoteAddress()).getAddress().getHostAddress();
if (isBanned(ipAddress))
throw new HttpProcessingException(404);
_uriRequestHandler.handleRequest(uri, request, _objects, responseWriter, e);
responseWriter.writeError(404);
else
_uriRequestHandler.handleRequest(uri, request, _objects, responseWriter, e);
} catch (HttpProcessingException exp) {
responseWriter.writeError(exp.getStatus());
} catch (Exception exp) {

2
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/AdminRequestHandler.java
View File

@@ -97,7 +97,7 @@ public class AdminRequestHandler extends LotroServerRequestHandler implements Ur
} else if (uri.equals("/findMultipleAccounts") && request.getMethod() == HttpMethod.POST) {
findMultipleAccounts(request, responseWriter);
} else {
responseWriter.writeError(404);
throw new HttpProcessingException(404);
}
}

2
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/ChatRequestHandler.java
View File

@@ -44,7 +44,7 @@ public class ChatRequestHandler extends LotroServerRequestHandler implements Uri
} else if (uri.startsWith("/") && request.getMethod() == HttpMethod.POST) {
postMessages(request, URLDecoder.decode(uri.substring(1)), responseWriter);
} else {
responseWriter.writeError(404);
throw new HttpProcessingException(404);
}
}

2
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/CollectionRequestHandler.java
View File

@@ -65,7 +65,7 @@ public class CollectionRequestHandler extends LotroServerRequestHandler implemen
} else if (uri.startsWith("/") && request.getMethod() == HttpMethod.GET) {
getCollection(request, uri.substring(1), responseWriter);
} else {
responseWriter.writeError(404);
throw new HttpProcessingException(404);
}
}

2
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/DeckRequestHandler.java
View File

@@ -56,7 +56,7 @@ public class DeckRequestHandler extends LotroServerRequestHandler implements Uri
} else if (uri.equals("/stats") && request.getMethod() == HttpMethod.POST) {
getDeckStats(request, responseWriter);
} else {
responseWriter.writeError(404);
throw new HttpProcessingException(404);
}
}

2
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/DeliveryRequestHandler.java
View File

@@ -29,7 +29,7 @@ public class DeliveryRequestHandler extends LotroServerRequestHandler implements
if (uri.equals("") && request.getMethod() == HttpMethod.GET) {
getDelivery(request, responseWriter);
} else {
responseWriter.writeError(404);
throw new HttpProcessingException(404);
}
}

2
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/GameHistoryRequestHandler.java
View File

@@ -81,7 +81,7 @@ public class GameHistoryRequestHandler extends LotroServerRequestHandler impleme
responseWriter.writeXmlResponse(doc);
} else {
responseWriter.writeError(404);
throw new HttpProcessingException(404);
}
}
}

8
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/GameRequestHandler.java
View File

@@ -60,7 +60,7 @@ public class GameRequestHandler extends LotroServerRequestHandler implements Uri
} else if (uri.startsWith("/") && request.getMethod() == HttpMethod.POST) {
updateGameState(request, uri.substring(1), responseWriter);
} else {
responseWriter.writeError(404);
throw new HttpProcessingException(404);
}
}
@@ -90,11 +90,11 @@ public class GameRequestHandler extends LotroServerRequestHandler implements Uri
GameUpdateLongPollingResource pollingResource = new GameUpdateLongPollingResource(pollableResource, channelNumber, gameMediator, resourceOwner, responseWriter);
_longPollingSystem.processLongPollingResource(pollingResource, pollableResource);
} catch (SubscriptionConflictException exp) {
responseWriter.writeError(409);
throw new HttpProcessingException(409);
} catch (PrivateInformationException e) {
responseWriter.writeError(403);
throw new HttpProcessingException(403);
} catch (SubscriptionExpiredException e) {
responseWriter.writeError(410);
throw new HttpProcessingException(410);
}
}

8
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/LeagueRequestHandler.java
View File

@@ -54,7 +54,7 @@ public class LeagueRequestHandler extends LotroServerRequestHandler implements U
} else if (uri.startsWith("/") && request.getMethod() == HttpMethod.POST) {
joinLeague(request, uri.substring(1), responseWriter, e);
} else {
responseWriter.writeError(404);
throw new HttpProcessingException(404);
}
}
@@ -94,13 +94,15 @@ public class LeagueRequestHandler extends LotroServerRequestHandler implements U
final List<LeagueSerieData> series = leagueData.getSeries();
int end = series.get(series.size() - 1).getEnd();
int start = series.get(0).getStart();
int currentDate = DateUtils.getCurrentDate();
Element leagueElem = doc.createElement("league");
boolean inLeague = _leagueService.isPlayerInLeague(league, resourceOwner);
leagueElem.setAttribute("member", String.valueOf(inLeague));
leagueElem.setAttribute("joinable", String.valueOf(!inLeague && end >= DateUtils.getCurrentDate()));
leagueElem.setAttribute("draftable", String.valueOf(inLeague && leagueData.isSoloDraftLeague()));
leagueElem.setAttribute("joinable", String.valueOf(!inLeague && end >= currentDate));
leagueElem.setAttribute("draftable", String.valueOf(inLeague && leagueData.isSoloDraftLeague() && start >= currentDate));
leagueElem.setAttribute("type", league.getType());
leagueElem.setAttribute("name", league.getName());
leagueElem.setAttribute("cost", String.valueOf(league.getCost()));

10
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/LoginRequestHandler.java
View File

@@ -1,5 +1,6 @@
package com.gempukku.lotro.async.handler;
import com.gempukku.lotro.async.HttpProcessingException;
import com.gempukku.lotro.async.ResponseWriter;
import com.gempukku.lotro.game.Player;
import org.jboss.netty.channel.MessageEvent;
@@ -28,18 +29,17 @@ public class LoginRequestHandler extends LotroServerRequestHandler implements Ur
if (player.getType().contains("u")) {
final Date bannedUntil = player.getBannedUntil();
if (bannedUntil != null && bannedUntil.after(new Date()))
responseWriter.writeError(409);
throw new HttpProcessingException(409);
else
responseWriter.writeXmlResponse(null, logUserReturningHeaders(e, login));
} else {
responseWriter.writeError(403);
throw new HttpProcessingException(403);
}
} else {
responseWriter.writeError(401);
throw new HttpProcessingException(401);
}
} else {
responseWriter.writeError(404);
throw new HttpProcessingException(404);
}
}

3
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/MerchantRequestHandler.java
View File

@@ -1,5 +1,6 @@
package com.gempukku.lotro.async.handler;
import com.gempukku.lotro.async.HttpProcessingException;
import com.gempukku.lotro.async.ResponseWriter;
import com.gempukku.lotro.cards.CardSets;
import com.gempukku.lotro.cards.packs.SetDefinition;
@@ -55,7 +56,7 @@ public class MerchantRequestHandler extends LotroServerRequestHandler implements
} else if (uri.equals("/tradeFoil") && request.getMethod() == HttpMethod.POST) {
tradeInFoil(request, responseWriter);
} else {
responseWriter.writeError(404);
throw new HttpProcessingException(404);
}
}

16
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/MtgCardsRequestHandler.java
View File

@@ -1,5 +1,6 @@
package com.gempukku.lotro.async.handler;
import com.gempukku.lotro.async.HttpProcessingException;
import com.gempukku.lotro.async.ResponseWriter;
import com.gempukku.mtg.MtgCardServer;
import com.gempukku.mtg.ProviderNotFoundException;
@@ -44,16 +45,13 @@ public class MtgCardsRequestHandler implements UriRequestHandler {
responseWriter.writeByteResponse(dataProvidersResponse, headers);
}
private void processCardListRequest(ResponseWriter responseWriter, String provider, String updateMarker) {
private void processCardListRequest(ResponseWriter responseWriter, String provider, String updateMarker) throws Exception {
try {
MtgCardServer.CardDatabaseHolder cardDatabaseHolder = _mtgCardServer.getCardDatabaseHolder(provider);
if (cardDatabaseHolder == null) {
responseWriter.writeError(204);
return;
} else if (updateMarker != null && updateMarker.equals(String.valueOf(cardDatabaseHolder.getUpdateDate()))) {
responseWriter.writeError(304);
return;
}
if (cardDatabaseHolder == null)
throw new HttpProcessingException(204);
else if (updateMarker != null && updateMarker.equals(String.valueOf(cardDatabaseHolder.getUpdateDate())))
throw new HttpProcessingException(304);
Map<String, String> headers = new HashMap<String, String>();
headers.put(CONTENT_TYPE, "application/json; charset=UTF-8");
@@ -61,7 +59,7 @@ public class MtgCardsRequestHandler implements UriRequestHandler {
responseWriter.writeByteResponse(cardDatabaseHolder.getBytes(), headers);
} catch (ProviderNotFoundException exp) {
responseWriter.writeError(404);
throw new HttpProcessingException(404);
}
}

3
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/PlayerStatsRequestHandler.java
View File

@@ -1,5 +1,6 @@
package com.gempukku.lotro.async.handler;
import com.gempukku.lotro.async.HttpProcessingException;
import com.gempukku.lotro.async.ResponseWriter;
import com.gempukku.lotro.db.PlayerStatistic;
import com.gempukku.lotro.game.GameHistoryService;
@@ -56,7 +57,7 @@ public class PlayerStatsRequestHandler extends LotroServerRequestHandler impleme
responseWriter.writeXmlResponse(doc);
} else {
responseWriter.writeError(404);
throw new HttpProcessingException(404);
}
}

2
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/RegisterRequestHandler.java
View File

@@ -34,7 +34,7 @@ public class RegisterRequestHandler extends LotroServerRequestHandler implements
}
} else {
responseWriter.writeError(404);
throw new HttpProcessingException(404);
}
}
}

2
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/ReplayRequestHandler.java
View File

@@ -57,7 +57,7 @@ public class ReplayRequestHandler extends LotroServerRequestHandler implements U
responseWriter.writeByteResponse(baos.toByteArray(), headers);
} else {
responseWriter.writeError(404);
throw new HttpProcessingException(404);
}
}
}

3
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/RootUriRequestHandler.java
View File

@@ -1,5 +1,6 @@
package com.gempukku.lotro.async.handler;
import com.gempukku.lotro.async.HttpProcessingException;
import com.gempukku.lotro.async.ResponseWriter;
import com.gempukku.lotro.common.ApplicationConfiguration;
import org.jboss.netty.channel.MessageEvent;
@@ -101,7 +102,7 @@ public class RootUriRequestHandler implements UriRequestHandler {
} else if (uri.equals(_serverContextPath)) {
_statusRequestHandler.handleRequest(uri.substring(_serverContextPath.length()), request, context, responseWriter, e);
} else {
responseWriter.writeError(404);
throw new HttpProcessingException(404);
}
}
}

2
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/ServerStatsRequestHandler.java
View File

@@ -86,7 +86,7 @@ public class ServerStatsRequestHandler extends LotroServerRequestHandler impleme
throw new HttpProcessingException(400);
}
} else {
responseWriter.writeError(404);
throw new HttpProcessingException(404);
}
}
}

28
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/SoloDraftRequestHandler.java
View File

@@ -1,5 +1,7 @@
package com.gempukku.lotro.async.handler;
import com.gempukku.lotro.DateUtils;
import com.gempukku.lotro.async.HttpProcessingException;
import com.gempukku.lotro.async.ResponseWriter;
import com.gempukku.lotro.cards.CardSets;
import com.gempukku.lotro.collection.CollectionsManager;
@@ -48,7 +50,7 @@ public class SoloDraftRequestHandler extends LotroServerRequestHandler implement
} else if (uri.startsWith("/") && request.getMethod() == HttpMethod.GET) {
getAvailablePicks(request, uri.substring(1), responseWriter);
} else {
responseWriter.writeError(404);
throw new HttpProcessingException(404);
}
}
@@ -59,11 +61,13 @@ public class SoloDraftRequestHandler extends LotroServerRequestHandler implement
League league = findLeagueByType(leagueType);
if (league == null)
responseWriter.writeError(404);
throw new HttpProcessingException(404);
LeagueData leagueData = league.getLeagueData(_cardSets, _soloDraftDefinitions);
if (!leagueData.isSoloDraftLeague())
responseWriter.writeError(404);
int leagueStart = leagueData.getSeries().get(0).getStart();
if (!leagueData.isSoloDraftLeague() || DateUtils.getCurrentDate() < leagueStart)
throw new HttpProcessingException(404);
SoloDraftLeagueData soloDraftLeagueData = (SoloDraftLeagueData) leagueData;
CollectionType collectionType = soloDraftLeagueData.getCollectionType();
@@ -113,11 +117,13 @@ public class SoloDraftRequestHandler extends LotroServerRequestHandler implement
League league = findLeagueByType(leagueType);
if (league == null)
responseWriter.writeError(404);
throw new HttpProcessingException(404);
LeagueData leagueData = league.getLeagueData(_cardSets, _soloDraftDefinitions);
if (!leagueData.isSoloDraftLeague())
responseWriter.writeError(404);
int leagueStart = leagueData.getSeries().get(0).getStart();
if (!leagueData.isSoloDraftLeague() || DateUtils.getCurrentDate() < leagueStart)
throw new HttpProcessingException(404);
SoloDraftLeagueData soloDraftLeagueData = (SoloDraftLeagueData) leagueData;
CollectionType collectionType = soloDraftLeagueData.getCollectionType();
@@ -127,7 +133,7 @@ public class SoloDraftRequestHandler extends LotroServerRequestHandler implement
CardCollection collection = _collectionsManager.getPlayerCollection(resourceOwner, collectionType.getCode());
boolean finished = (Boolean) collection.getExtraInformation().get("finished");
if (finished)
responseWriter.writeError(404);
throw new HttpProcessingException(404);
int stage = ((Number) collection.getExtraInformation().get("stage")).intValue();
long playerSeed = ((Number) collection.getExtraInformation().get("seed")).longValue();
@@ -137,12 +143,12 @@ public class SoloDraftRequestHandler extends LotroServerRequestHandler implement
SoloDraft.DraftChoice draftChoice = getSelectedDraftChoice(selectedChoiceId, possibleChoices);
if (draftChoice == null)
responseWriter.writeError(400);
throw new HttpProcessingException(400);
CardCollection selectedCards = soloDraft.getCardsForChoiceId(selectedChoiceId, playerSeed, stage);
Map<String, Object> extraInformationChanges = new HashMap<String, Object>();
boolean hasNextStage = soloDraft.hasNextStage(playerSeed, stage);
extraInformationChanges.put("stage", stage+1);
extraInformationChanges.put("stage", stage + 1);
if (!hasNextStage)
extraInformationChanges.put("finished", true);
@@ -164,7 +170,7 @@ public class SoloDraftRequestHandler extends LotroServerRequestHandler implement
}
if (hasNextStage) {
Iterable<SoloDraft.DraftChoice> availableChoices = soloDraft.getAvailableChoices(playerSeed, stage+1);
Iterable<SoloDraft.DraftChoice> availableChoices = soloDraft.getAvailableChoices(playerSeed, stage + 1);
appendAvailablePics(doc, pickResultElem, availableChoices);
}

3
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/StatusRequestHandler.java
View File

@@ -1,5 +1,6 @@
package com.gempukku.lotro.async.handler;
import com.gempukku.lotro.async.HttpProcessingException;
import com.gempukku.lotro.async.ResponseWriter;
import com.gempukku.lotro.chat.ChatServer;
import com.gempukku.lotro.game.GameHistoryService;
@@ -36,7 +37,7 @@ public class StatusRequestHandler extends LotroServerRequestHandler implements U
responseWriter.writeHtmlResponse(sb.toString());
} else {
responseWriter.writeError(404);
throw new HttpProcessingException(404);
}
}
}

2
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/TournamentRequestHandler.java
View File

@@ -52,7 +52,7 @@ public class TournamentRequestHandler extends LotroServerRequestHandler implemen
} else if (uri.startsWith("/") && request.getMethod() == HttpMethod.GET) {
getTournamentInfo(request, uri.substring(1), responseWriter);
} else {
responseWriter.writeError(404);
throw new HttpProcessingException(404);
}
}

27
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/WebRequestHandler.java
View File

@@ -1,9 +1,12 @@
package com.gempukku.lotro.async.handler;
import com.gempukku.lotro.async.HttpProcessingException;
import com.gempukku.lotro.async.ResponseWriter;
import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.handler.codec.http.HttpHeaders;
import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.IF_NONE_MATCH;
import org.jboss.netty.handler.codec.http.HttpRequest;
import java.io.File;
@@ -22,10 +25,8 @@ public class WebRequestHandler implements UriRequestHandler {
@Override
public void handleRequest(String uri, HttpRequest request, Map<Type, Object> context, ResponseWriter responseWriter, MessageEvent e) throws Exception {
if (clientHasCurrentVersion(request)) {
responseWriter.writeError(304);
return;
}
if (clientHasCurrentVersion(request))
throw new HttpProcessingException(304);
if (uri.equals(""))
uri = "index.html";
@@ -34,16 +35,14 @@ public class WebRequestHandler implements UriRequestHandler {
if ((uri.contains(".."))
|| uri.contains(File.separator + ".")
|| uri.startsWith(".") || uri.endsWith(".")) {
responseWriter.writeError(403);
} else {
File file = new File(_root + uri);
if (!file.getCanonicalPath().startsWith(_root))
responseWriter.writeError(403);
else {
responseWriter.writeFile(file, Collections.singletonMap(HttpHeaders.Names.ETAG, _uniqueEtag));
}
}
|| uri.startsWith(".") || uri.endsWith("."))
throw new HttpProcessingException(403);
File file = new File(_root + uri);
if (!file.getCanonicalPath().startsWith(_root))
throw new HttpProcessingException(403);
responseWriter.writeFile(file, Collections.singletonMap(HttpHeaders.Names.ETAG, _uniqueEtag));
}
private boolean clientHasCurrentVersion(HttpRequest request) {

6
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/ConstructedLeagueData.java
View File

@@ -5,6 +5,7 @@ import com.gempukku.lotro.cards.CardSets;
import com.gempukku.lotro.collection.CollectionsManager;
import com.gempukku.lotro.competitive.PlayerStanding;
import com.gempukku.lotro.db.vo.CollectionType;
import com.gempukku.lotro.draft2.SoloDraft;
import com.gempukku.lotro.draft2.SoloDraftDefinitions;
import com.gempukku.lotro.game.CardCollection;
import com.gempukku.lotro.game.Player;
@@ -47,6 +48,11 @@ public class ConstructedLeagueData implements LeagueData {
return false;
}
@Override
public SoloDraft getSoloDraft() {
return null;
}
@Override
public List<LeagueSerieData> getSeries() {
return _series;

11
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueData.java
View File

@@ -2,17 +2,20 @@ package com.gempukku.lotro.league;
import com.gempukku.lotro.collection.CollectionsManager;
import com.gempukku.lotro.competitive.PlayerStanding;
import com.gempukku.lotro.draft2.SoloDraft;
import com.gempukku.lotro.game.CardCollection;
import com.gempukku.lotro.game.Player;
import java.util.List;
public interface LeagueData {
public boolean isSoloDraftLeague();
boolean isSoloDraftLeague();
public List<LeagueSerieData> getSeries();
List<LeagueSerieData> getSeries();
public CardCollection joinLeague(CollectionsManager collecionsManager, Player player, int currentTime);
SoloDraft getSoloDraft();
public int process(CollectionsManager collectionsManager, List<PlayerStanding> leagueStandings, int oldStatus, int currentTime);
CardCollection joinLeague(CollectionsManager collecionsManager, Player player, int currentTime);
int process(CollectionsManager collectionsManager, List<PlayerStanding> leagueStandings, int oldStatus, int currentTime);
}

6
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewConstructedLeagueData.java
View File

@@ -5,6 +5,7 @@ import com.gempukku.lotro.cards.CardSets;
import com.gempukku.lotro.collection.CollectionsManager;
import com.gempukku.lotro.competitive.PlayerStanding;
import com.gempukku.lotro.db.vo.CollectionType;
import com.gempukku.lotro.draft2.SoloDraft;
import com.gempukku.lotro.draft2.SoloDraftDefinitions;
import com.gempukku.lotro.game.CardCollection;
import com.gempukku.lotro.game.Player;
@@ -50,6 +51,11 @@ public class NewConstructedLeagueData implements LeagueData {
return false;
}
@Override
public SoloDraft getSoloDraft() {
return null;
}
@Override
public List<LeagueSerieData> getSeries() {
return Collections.unmodifiableList(_series);

6
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewSealedLeagueData.java
View File

@@ -5,6 +5,7 @@ import com.gempukku.lotro.cards.CardSets;
import com.gempukku.lotro.collection.CollectionsManager;
import com.gempukku.lotro.competitive.PlayerStanding;
import com.gempukku.lotro.db.vo.CollectionType;
import com.gempukku.lotro.draft2.SoloDraft;
import com.gempukku.lotro.draft2.SoloDraftDefinitions;
import com.gempukku.lotro.game.CardCollection;
import com.gempukku.lotro.game.DefaultCardCollection;
@@ -51,6 +52,11 @@ public class NewSealedLeagueData implements LeagueData {
return false;
}
@Override
public SoloDraft getSoloDraft() {
return null;
}
@Override
public List<LeagueSerieData> getSeries() {
return Collections.unmodifiableList(_series);

6
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueData.java
View File

@@ -5,6 +5,7 @@ import com.gempukku.lotro.cards.CardSets;
import com.gempukku.lotro.collection.CollectionsManager;
import com.gempukku.lotro.competitive.PlayerStanding;
import com.gempukku.lotro.db.vo.CollectionType;
import com.gempukku.lotro.draft2.SoloDraft;
import com.gempukku.lotro.draft2.SoloDraftDefinitions;
import com.gempukku.lotro.game.CardCollection;
import com.gempukku.lotro.game.DefaultCardCollection;
@@ -51,6 +52,11 @@ public class SealedLeagueData implements LeagueData {
return false;
}
@Override
public SoloDraft getSoloDraft() {
return null;
}
@Override
public List<LeagueSerieData> getSeries() {
return Collections.unmodifiableList(_series);

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

@@ -42,6 +42,7 @@ public class SoloDraftLeagueData implements LeagueData {
return _collectionType;
}
@Override
public SoloDraft getSoloDraft() {
return _draft;
}
@@ -64,11 +65,12 @@ 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);
CardCollection leagueProduct = _draft.initializeNewCollection(seed);
for (Map.Entry<String, CardCollection.Item> serieCollectionItem : leagueProduct.getAll().entrySet())
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));
collectionsManager.addPlayerCollection(false, "Sealed league product", player, _collectionType, startingCollection);
@@ -86,17 +88,21 @@ public class SoloDraftLeagueData implements LeagueData {
@Override
public int process(CollectionsManager collectionsManager, List<PlayerStanding> leagueStandings, int oldStatus, int currentTime) {
int status = oldStatus;
if (status == 0) {
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());
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;
}
status = 1;
}
int maxGamesTotal = _serie.getMaxMatches();
if (status == 1) {