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

Merge pull request #46 from PhallenCassidy/MyCards-Fix

Browse Source 
My Cards corrections
This commit is contained in:
Marcin Sciesinski
2018-04-16 12:55:32 -07:00
committed by GitHub
parent a032cbb578 e60009ade3
commit caa6753ac6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/vo/CollectionType.java
View File

@@ -8,7 +8,7 @@ public final class CollectionType {
public final static CollectionType TROPHY = new CollectionType("trophy", "Trophies");
public final static CollectionType ALL_CARDS = new CollectionType("default", "All cards");
public final static CollectionType OWNED_TOURNAMENT_CARDS = new CollectionType("permanent+trophy", "All cards");
public final static CollectionType OWNED_TOURNAMENT_CARDS = new CollectionType("permanent+trophy", "My cards");
private final String _code;
private final String _fullName;

2
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/FixedLeaguePrizes.java
View File

@@ -49,7 +49,7 @@ public class FixedLeaguePrizes implements LeaguePrizes {
public CardCollection getPrizeForLeague(int position, int playersCount, int gamesPlayed, int maxGamesPlayed, CollectionType collectionType) {
if (collectionType.equals(CollectionType.ALL_CARDS)) {
return getPrizeForConstructedLeague(position, playersCount, gamesPlayed, maxGamesPlayed);
} else if (collectionType.equals(CollectionType.MY_CARDS)) {
} else if (collectionType.equals(CollectionType.MY_CARDS) || collectionType.equals(CollectionType.OWNED_TOURNAMENT_CARDS)) {
return getPrizeForCollectorsLeague(position, playersCount, gamesPlayed, maxGamesPlayed);
} else {
return getPrizeForSealedLeague(position, playersCount, gamesPlayed, maxGamesPlayed);