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

Merge branch 'fixnpe' into 'master'

Browse Source 
UntapAi: Fix NPE

See merge request core-developers/forge!4713
This commit is contained in:
Michael Kamensky
2021-05-18 19:33:37 +00:00
parent 13bd24ef83 c6b82043d0
commit e18007e902
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-ai/src/main/java/forge/ai/ability/TapAiBase.java
View File

@@ -11,6 +11,7 @@ import forge.ai.ComputerUtilAbility;
import forge.ai.ComputerUtilCard; import forge.ai.ComputerUtilCard;
import forge.ai.SpellAbilityAi; import forge.ai.SpellAbilityAi;
import forge.game.Game; import forge.game.Game;
import forge.game.ability.AbilityUtils;
import forge.game.ability.ApiType; import forge.game.ability.ApiType;
import forge.game.card.Card; import forge.game.card.Card;
import forge.game.card.CardCollection; import forge.game.card.CardCollection;
@@ -309,9 +310,8 @@ public abstract class TapAiBase extends SpellAbilityAi {
return true; return true;
} }
// TODO: use Defined to determine, if this is an unfavorable result final List<Card> pDefined = AbilityUtils.getDefinedCards(sa.getHostCard(), sa.getParam("Defined"), sa);
return pDefined.isEmpty() || (pDefined.get(0).isUntapped() && pDefined.get(0).getController() != ai);
return true;
} else { } else {
sa.resetTargets(); sa.resetTargets();
if (tapPrefTargeting(ai, source, sa, mandatory)) { if (tapPrefTargeting(ai, source, sa, mandatory)) {

5
forge-ai/src/main/java/forge/ai/ability/UntapAi.java
View File

@@ -66,7 +66,7 @@ public class UntapAi extends SpellAbilityAi {
if (!sa.usesTargeting()) { if (!sa.usesTargeting()) {
final List<Card> pDefined = AbilityUtils.getDefinedCards(source, sa.getParam("Defined"), sa); final List<Card> pDefined = AbilityUtils.getDefinedCards(source, sa.getParam("Defined"), sa);
return pDefined == null || !pDefined.get(0).isUntapped() || pDefined.get(0).getController() != ai; return pDefined.isEmpty() || (pDefined.get(0).isTapped() && pDefined.get(0).getController() == ai);
} else { } else {
return untapPrefTargeting(ai, sa, false); return untapPrefTargeting(ai, sa, false);
} }
@@ -82,9 +82,8 @@ public class UntapAi extends SpellAbilityAi {
return false; return false;
} }
// TODO: use Defined to determine, if this is an unfavorable result
final List<Card> pDefined = AbilityUtils.getDefinedCards(sa.getHostCard(), sa.getParam("Defined"), sa); final List<Card> pDefined = AbilityUtils.getDefinedCards(sa.getHostCard(), sa.getParam("Defined"), sa);
return pDefined == null || !pDefined.get(0).isUntapped() || pDefined.get(0).getController() != ai; return pDefined.isEmpty() || (pDefined.get(0).isTapped() && pDefined.get(0).getController() == ai);
} else { } else {
if (untapPrefTargeting(ai, sa, mandatory)) { if (untapPrefTargeting(ai, sa, mandatory)) {
return true; return true;