mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-20 12:48:00 +00:00
@@ -35,9 +35,10 @@ public class ChangeTargetsEffect extends SpellAbilityEffect {
|
||||
public void resolve(SpellAbility sa) {
|
||||
final List<SpellAbility> sas = getTargetSpells(sa);
|
||||
final Player activator = sa.getActivatingPlayer();
|
||||
final Player chooser = sa.hasParam("Chooser") ? getDefinedPlayersOrTargeted(sa, "Chooser").get(0) : sa.getActivatingPlayer();
|
||||
final Player chooser = sa.hasParam("Chooser") ? getDefinedPlayersOrTargeted(sa, "Chooser").get(0) : activator;
|
||||
|
||||
final MagicStack stack = activator.getGame().getStack();
|
||||
|
||||
for (final SpellAbility tgtSA : sas) {
|
||||
SpellAbilityStackInstance si = stack.getInstanceMatchingSpellAbilityID(tgtSA);
|
||||
if (si == null) {
|
||||
@@ -101,7 +102,7 @@ public class ChangeTargetsEffect extends SpellAbilityEffect {
|
||||
candidates.removeIf(new java.util.function.Predicate<GameEntity>() {
|
||||
@Override
|
||||
public boolean test(GameEntity c) {
|
||||
return !c.isValid(sa.getParam("RandomTargetRestriction").split(","), sa.getActivatingPlayer(), sa.getHostCard(), sa);
|
||||
return !c.isValid(sa.getParam("RandomTargetRestriction").split(","), activator, sa.getHostCard(), sa);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user