diff --git a/Mage.Sets/src/mage/cards/b/BeamsplitterMage.java b/Mage.Sets/src/mage/cards/b/BeamsplitterMage.java index 6555fa016d1..fbc6929796f 100644 --- a/Mage.Sets/src/mage/cards/b/BeamsplitterMage.java +++ b/Mage.Sets/src/mage/cards/b/BeamsplitterMage.java @@ -1,7 +1,6 @@ package mage.cards.b; import mage.MageInt; -import mage.MageObjectReference; import mage.abilities.Ability; import mage.abilities.AbilityImpl; import mage.abilities.Mode; @@ -194,10 +193,10 @@ class BeamsplitterMagePredicate implements Predicate { class BeamsplitterMageApplier implements StackObjectCopyApplier { - private final MageObjectReferencePredicate morPredicate; + private final Iterator predicate; BeamsplitterMageApplier(Permanent permanent, Game game) { - this.morPredicate = new MageObjectReferencePredicate(permanent, game); + this.predicate = Arrays.asList(new MageObjectReferencePredicate(permanent, game)).iterator(); } @Override @@ -206,6 +205,9 @@ class BeamsplitterMageApplier implements StackObjectCopyApplier { @Override public MageObjectReferencePredicate getNextNewTargetType() { - return morPredicate; + if (predicate.hasNext()) { + return predicate.next(); + } + return null; } } diff --git a/Mage.Sets/src/mage/cards/i/IvyGleefulSpellthief.java b/Mage.Sets/src/mage/cards/i/IvyGleefulSpellthief.java index db6d9658d63..fa3640188f1 100644 --- a/Mage.Sets/src/mage/cards/i/IvyGleefulSpellthief.java +++ b/Mage.Sets/src/mage/cards/i/IvyGleefulSpellthief.java @@ -23,7 +23,7 @@ import mage.target.Target; import mage.util.TargetAddress; import mage.util.functions.StackObjectCopyApplier; -import java.util.UUID; +import java.util.*; /** * @author TheElk801 @@ -97,10 +97,10 @@ class IvyGleefulSpellthiefEffect extends OneShotEffect { private static final class IvyGleefulSpellthiefApplier implements StackObjectCopyApplier { - private final MageObjectReferencePredicate morPredicate; + private final Iterator predicate; IvyGleefulSpellthiefApplier(Permanent permanent, Game game) { - this.morPredicate = new MageObjectReferencePredicate(permanent, game); + this.predicate = Arrays.asList(new MageObjectReferencePredicate(permanent, game)).iterator(); } @Override @@ -109,7 +109,10 @@ class IvyGleefulSpellthiefEffect extends OneShotEffect { @Override public MageObjectReferencePredicate getNextNewTargetType() { - return morPredicate; + if (predicate.hasNext()) { + return predicate.next(); + } + return null; } }