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

Merge branch 'fixNPE' into 'master'

Browse Source 
AI: Fix NPE

See merge request core-developers/forge!4280
This commit is contained in:
Bug Hunter
2021-03-26 21:34:09 +00:00
parent 0664d11f55 34a91b7e3d
commit 407c742124
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-ai/src/main/java/forge/ai/AiController.java
View File

@@ -1102,8 +1102,6 @@ public class AiController {
} }
public CardCollection getCardsToDiscard(int min, final int max, final CardCollection validCards, final SpellAbility sa) { public CardCollection getCardsToDiscard(int min, final int max, final CardCollection validCards, final SpellAbility sa) {
String logic = sa.getParamOrDefault("AILogic", "");
if (validCards.size() < min) { if (validCards.size() < min) {
return null; return null;
} }
@@ -1112,6 +1110,7 @@ public class AiController {
final CardCollection discardList = new CardCollection(); final CardCollection discardList = new CardCollection();
int count = 0; int count = 0;
if (sa != null) { if (sa != null) {
String logic = sa.getParamOrDefault("AILogic", "");
sourceCard = sa.getHostCard(); sourceCard = sa.getHostCard();
if ("Always".equals(logic) && !validCards.isEmpty()) { if ("Always".equals(logic) && !validCards.isEmpty()) {
min = 1; min = 1;