- Don't spam the console with SVar fallback for Commander's SpellPermanent SAs

This commit is contained in:
Sol
2015-11-20 03:21:51 +00:00
parent d9b5a0b2da
commit 66fdfb62f1

View File

@@ -13,12 +13,7 @@ import forge.game.card.*;
import forge.game.cost.Cost; import forge.game.cost.Cost;
import forge.game.mana.ManaCostBeingPaid; import forge.game.mana.ManaCostBeingPaid;
import forge.game.player.Player; import forge.game.player.Player;
import forge.game.spellability.AbilitySub; import forge.game.spellability.*;
import forge.game.spellability.Spell;
import forge.game.spellability.SpellAbility;
import forge.game.spellability.SpellAbilityRestriction;
import forge.game.spellability.SpellAbilityStackInstance;
import forge.game.spellability.TargetChoices;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.util.Expressions; import forge.util.Expressions;
import forge.util.collect.FCollection; import forge.util.collect.FCollection;
@@ -351,7 +346,7 @@ public class AbilityUtils {
svarval = ((SpellAbility)ability).getSVar(amount); svarval = ((SpellAbility)ability).getSVar(amount);
} }
if (StringUtils.isBlank(svarval)) { if (StringUtils.isBlank(svarval)) {
if (ability != null && ability instanceof SpellAbility) { if ((ability != null) && (ability instanceof SpellAbility) && !(ability instanceof SpellPermanent)) {
System.err.printf("SVar '%s' not found in ability, fallback to Card (%s). Ability is (%s)%n", amount, card.getName(), ability); System.err.printf("SVar '%s' not found in ability, fallback to Card (%s). Ability is (%s)%n", amount, card.getName(), ability);
} }
svarval = card.getSVar(amount); svarval = card.getSVar(amount);