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

Merge branch 'fixNPE' into 'master'

Browse Source 
getTargetableCards: Fix AI NPE

See merge request core-developers/forge!4611
This commit is contained in:
Hans Mackowiak
2021-04-28 21:13:19 +00:00
parent abf1a92977 8e4c40ba2a
commit fd0f6e4113
2 changed files with 4 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/PermanentNoncreatureAi.java
View File

@@ -40,10 +40,8 @@ public class PermanentNoncreatureAi extends PermanentAi {
if (host.hasSVar("OblivionRing")) {
SpellAbility effectExile = AbilityFactory.getAbility(host.getSVar("TrigExile"), host);
final ZoneType origin = ZoneType.listValueOf(effectExile.getParam("Origin")).get(0);
final TargetRestrictions tgt = effectExile.getTargetRestrictions();
final CardCollection list = CardLists.getValidCards(game.getCardsIn(origin), tgt.getValidTgts(), ai, host,
effectExile);
CardCollection targets = CardLists.getTargetableCards(list, sa);
effectExile.setActivatingPlayer(ai);
CardCollection targets = CardLists.getTargetableCards(game.getCardsIn(origin), effectExile);
if (sourceName.equals("Suspension Field")
|| sourceName.equals("Detention Sphere")) {
// existing "exile until leaves" enchantments only target

4
forge-game/src/main/java/forge/game/card/CardLists.java
View File

@@ -232,8 +232,8 @@ public class CardLists {
public static CardCollection getTargetableCards(Iterable<Card> cardList, SpellAbility source) {
CardCollection result = CardLists.filter(cardList, CardPredicates.isTargetableBy(source));
// Filter more cards that can only be detected along with other candiates
if (source.getTargets().isEmpty() && source.getMinTargets() >= 2) {
// Filter more cards that can only be detected along with other candidates
if (source.getTargets().isEmpty() && source.usesTargeting() && source.getMinTargets() >= 2) {
CardCollection removeList = new CardCollection();
TargetRestrictions tr = source.getTargetRestrictions();
for (final Card card : cardList) {