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

Merge branch 'gauntletfix' into 'master'

Browse Source 
Fix some more NPE related to gauntlets

See merge request core-developers/forge!5583
This commit is contained in:
Michael Kamensky
2021-10-18 16:27:26 +00:00
parent 5c97a0f835 5b72d1f682
commit 33566c037c
14 changed files with 36 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/CSubmenuGauntletBuild.java
View File

@@ -122,8 +122,8 @@ public enum CSubmenuGauntletBuild implements ICDoc {
}
private void addDeck() {
final Deck deckToAdd = view.getLstLeft().getPlayer().getDeck();
if ( null == deckToAdd ) {
final Deck deckToAdd = view.getLstLeft().getPlayer() != null ? view.getLstLeft().getPlayer().getDeck() : null;
if (null == deckToAdd) {
return;
}
workingDecks.add(deckToAdd);
@@ -145,7 +145,7 @@ public enum CSubmenuGauntletBuild implements ICDoc {
private void deckUp() {
final int oldIndex = view.getLstRight().getSelectedIndex();
if (oldIndex == 0) { return; }
if (oldIndex <= 0) { return; }
final Deck movingDeck = workingDecks.remove(oldIndex);
workingDecks.add(oldIndex - 1, movingDeck);