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 'master' into 'master'

Browse Source 
prevent NPE

See merge request core-developers/forge!3668
This commit is contained in:
Anthony Calosa
2021-01-29 02:31:56 +00:00
parent c6693afa29 25c3f3601a
commit ec04b06d40
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-gui-mobile/src/forge/deck/FDeckEditor.java
View File

@@ -806,7 +806,12 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
} }
else if (parentScreen.getEditorType() == EditorType.Quest||parentScreen.getEditorType() == EditorType.QuestCommander) { else if (parentScreen.getEditorType() == EditorType.Quest||parentScreen.getEditorType() == EditorType.QuestCommander) {
//prevent adding more than is in quest inventory //prevent adding more than is in quest inventory
try {
qty = parentScreen.getCatalogPage().cardManager.getItemCount(card); qty = parentScreen.getCatalogPage().cardManager.getItemCount(card);
} catch (Exception e) {
//prevent NPE
qty = 0;
}
} }
else { else {
//if not source of items being added, use max directly if unlimited pool //if not source of items being added, use max directly if unlimited pool