diff --git a/Mage.Sets/src/mage/sets/futuresight/KavuPrimarch.java b/Mage.Sets/src/mage/sets/futuresight/KavuPrimarch.java index 4c130d1b744..7796bfeacb8 100644 --- a/Mage.Sets/src/mage/sets/futuresight/KavuPrimarch.java +++ b/Mage.Sets/src/mage/sets/futuresight/KavuPrimarch.java @@ -54,7 +54,7 @@ public class KavuPrimarch extends CardImpl { this.toughness = new MageInt(3); // Convoke (Each creature you tap while casting this spell reduces its cost by {1} or by one mana of that creature's color.) - this.addAbility(ConvokeAbility.getInstance()); + this.addAbility(new ConvokeAbility()); // Kicker {4} (You may pay an additional {4} as you cast this spell.) this.getSpellAbility().addOptionalCost(new KickerManaCost("{4}")); diff --git a/Mage.Sets/src/mage/sets/ravnika/AutochthonWurm.java b/Mage.Sets/src/mage/sets/ravnika/AutochthonWurm.java index 939f366fbe7..0b18bfd7227 100644 --- a/Mage.Sets/src/mage/sets/ravnika/AutochthonWurm.java +++ b/Mage.Sets/src/mage/sets/ravnika/AutochthonWurm.java @@ -58,7 +58,7 @@ public class AutochthonWurm extends CardImpl { this.toughness = new MageInt(14); // Convoke (Each creature you tap while casting this spell reduces its cost by {1} or by one mana of that creature's color.) - this.addAbility(ConvokeAbility.getInstance()); + this.addAbility(new ConvokeAbility()); // Trample this.addAbility(TrampleAbility.getInstance()); diff --git a/Mage.Sets/src/mage/sets/ravnika/Overwhelm.java b/Mage.Sets/src/mage/sets/ravnika/Overwhelm.java index 51f0ce56e11..154be73e7cc 100644 --- a/Mage.Sets/src/mage/sets/ravnika/Overwhelm.java +++ b/Mage.Sets/src/mage/sets/ravnika/Overwhelm.java @@ -46,7 +46,7 @@ public class Overwhelm extends CardImpl { this.expansionSetCode = "RAV"; // Convoke (Each creature you tap while casting this spell reduces its cost by {1} or by one mana of that creature's color.) - this.addAbility(ConvokeAbility.getInstance()); + this.addAbility(new ConvokeAbility()); // Creatures you control get +3/+3 until end of turn. this.getSpellAbility().addEffect(new BoostControlledEffect(3, 3, Duration.EndOfTurn)); diff --git a/Mage/src/mage/abilities/keyword/ConvokeAbility.java b/Mage/src/mage/abilities/keyword/ConvokeAbility.java index 1522905043f..b8b64a8d1ac 100644 --- a/Mage/src/mage/abilities/keyword/ConvokeAbility.java +++ b/Mage/src/mage/abilities/keyword/ConvokeAbility.java @@ -88,31 +88,23 @@ import mage.util.CardUtil; public class ConvokeAbility extends SimpleStaticAbility implements AdjustingSourceCosts { - private static ConvokeAbility fINSTANCE = new ConvokeAbility(); private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(); static { filter.add(Predicates.not(new TappedPredicate())); } - private ConvokeAbility() { + public ConvokeAbility() { super(Zone.STACK, null); this.setRuleAtTheTop(true); } - public static ConvokeAbility getInstance() { - if (fINSTANCE == null) { - fINSTANCE = new ConvokeAbility(); - } - return fINSTANCE; - } - public ConvokeAbility(final ConvokeAbility ability) { super(ability); } @Override - public SimpleStaticAbility copy() { - return fINSTANCE; + public ConvokeAbility copy() { + return new ConvokeAbility(this); } @Override