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

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

@@ -556,6 +556,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
} }
Deck playerDeck = deck; Deck playerDeck = deck;
if (deck != null) {
if (hasVariant(GameType.Archenemy) || hasVariant(GameType.ArchenemyRumble)) { if (hasVariant(GameType.Archenemy) || hasVariant(GameType.ArchenemyRumble)) {
if (playerDeck == deck) { if (playerDeck == deck) {
playerDeck = new Deck(deck); //create copy that can be modified playerDeck = new Deck(deck); //create copy that can be modified
@@ -576,6 +577,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
avatarPool.add(playerPanel.getVanguardAvatar()); avatarPool.add(playerPanel.getVanguardAvatar());
playerDeck.putSection(DeckSection.Avatar, avatarPool); playerDeck.putSection(DeckSection.Avatar, avatarPool);
} }
}
decks[playerIndex] = playerDeck; decks[playerIndex] = playerDeck;
if (playerChangeListener != null) { if (playerChangeListener != null) {