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

If deck doesn't have ring - do not attempt to validate it.

Browse Source
This commit is contained in:
marcin.sciesinski
2017-11-10 12:56:16 -08:00
parent a1bd7343eb
commit 1b5b2a3ada
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/DefaultLotroGame.java
View File

@@ -75,7 +75,8 @@ public class DefaultLotroGame implements LotroGame {
cards.put(playerId, deck);
ringBearers.put(playerId, lotroDeck.getRingBearer());
rings.put(playerId, lotroDeck.getRing());
if (lotroDeck.getRing() != null)
rings.put(playerId, lotroDeck.getRing());
}
_gameState = new GameState();
@@ -100,7 +101,6 @@ public class DefaultLotroGame implements LotroGame {
}
@Override
public boolean shouldAutoPass(String playerId, Phase phase) {
final Set<Phase> passablePhases = _autoPassConfiguration.get(playerId);

3
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
View File

@@ -609,7 +609,8 @@ public class HallServer extends AbstractServer {
CardCollection ownedCollection = _collectionsManager.getPlayerCollection(player, "permanent+trophy");
LotroDeck filteredSpecialCardsDeck = new LotroDeck(lotroDeck.getDeckName());
filteredSpecialCardsDeck.setRing(filterCard(lotroDeck.getRing(), ownedCollection));
if (lotroDeck.getRing() != null)
filteredSpecialCardsDeck.setRing(filterCard(lotroDeck.getRing(), ownedCollection));
filteredSpecialCardsDeck.setRingBearer(filterCard(lotroDeck.getRingBearer(), ownedCollection));
for (String site : lotroDeck.getSites())