external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- NPE prevention in LobbyScreen on mobile Forge when trying to choose a variant without having a constructed deck.

Browse Source
This commit is contained in:
Agetian
2018-05-07 23:07:47 +03:00
parent 12631ffee6
commit 697be27d4f
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
View File

@@ -556,25 +556,27 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
} }
Deck playerDeck = deck; Deck playerDeck = deck;
if (hasVariant(GameType.Archenemy) || hasVariant(GameType.ArchenemyRumble)) { if (deck != null) {
if (playerDeck == deck) { if (hasVariant(GameType.Archenemy) || hasVariant(GameType.ArchenemyRumble)) {
playerDeck = new Deck(deck); //create copy that can be modified if (playerDeck == deck) {
playerDeck = new Deck(deck); //create copy that can be modified
}
playerDeck.putSection(DeckSection.Schemes, playerPanel.getSchemeDeck().get(DeckSection.Schemes));
} }
playerDeck.putSection(DeckSection.Schemes, playerPanel.getSchemeDeck().get(DeckSection.Schemes)); if (hasVariant(GameType.Planechase)) {
} if (playerDeck == deck) {
if (hasVariant(GameType.Planechase)) { playerDeck = new Deck(deck); //create copy that can be modified
if (playerDeck == deck) { }
playerDeck = new Deck(deck); //create copy that can be modified playerDeck.putSection(DeckSection.Planes, playerPanel.getPlanarDeck().get(DeckSection.Planes));
} }
playerDeck.putSection(DeckSection.Planes, playerPanel.getPlanarDeck().get(DeckSection.Planes)); if (hasVariant(GameType.Vanguard)) {
} if (playerDeck == deck) {
if (hasVariant(GameType.Vanguard)) { playerDeck = new Deck(deck); //create copy that can be modified
if (playerDeck == deck) { }
playerDeck = new Deck(deck); //create copy that can be modified CardPool avatarPool = new CardPool();
avatarPool.add(playerPanel.getVanguardAvatar());
playerDeck.putSection(DeckSection.Avatar, avatarPool);
} }
CardPool avatarPool = new CardPool();
avatarPool.add(playerPanel.getVanguardAvatar());
playerDeck.putSection(DeckSection.Avatar, avatarPool);
} }
decks[playerIndex] = playerDeck; decks[playerIndex] = playerDeck;