Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

fix test failure

Browse source
This commit is contained in:
theelk801 2023-04-09 15:44:30 -04:00
parent a223486497
commit ff41b7631d
2 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Mage.Sets/src/mage/cards/l/LethalScheme.java
View file

@ -1,5 +1,6 @@
package mage.cards.l;
import mage.MageObjectReference;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.DestroyTargetEffect;
@ -18,6 +19,7 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.common.TargetCreatureOrPlaneswalker;
import mage.watchers.common.ConvokeWatcher;
import java.util.*;
import java.util.stream.Collectors;
@ -53,15 +55,9 @@ public final class LethalScheme extends CardImpl {
// Based loosely on "Venerated Loxodon" and "Change of Plans"
class LethalSchemeEffect extends OneShotEffect {
private static final FilterPermanent filter = new FilterCreaturePermanent();
static {
filter.add(ConvokedSourcePredicate.SPELL);
}
public LethalSchemeEffect() {
super(Outcome.Benefit);
this.staticText = "Each creature that convoked Lethal Scheme connives.";
this.staticText = "Each creature that convoked {this} connives.";
}
public LethalSchemeEffect(final LethalSchemeEffect effect) {
@ -76,9 +72,10 @@ class LethalSchemeEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Set<AbstractMap.SimpleEntry<UUID, Permanent>> playerPermanentsPairs =
game.getBattlefield()
.getActivePermanents(filter, source.getControllerId(), source, game)
ConvokeWatcher.getConvokingCreatures(new MageObjectReference(source),game)
.stream()
.map(mor->mor.getPermanentOrLKIBattlefield(game))
.filter(Objects::nonNull)
.map(permanent -> new AbstractMap.SimpleEntry<>(permanent.getControllerId(), permanent))
.collect(Collectors.toSet());

7
Mage/src/main/java/mage/watchers/common/ConvokeWatcher.java
View file

@ -8,10 +8,7 @@ import mage.game.permanent.Permanent;
import mage.game.stack.Spell;
import mage.watchers.Watcher;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.*;
/**
* @author LevelX2
@ -44,7 +41,7 @@ public class ConvokeWatcher extends Watcher {
.getState()
.getWatcher(ConvokeWatcher.class)
.convokingCreatures
.get(mor);
.getOrDefault(mor, Collections.emptySet());
}
public static boolean checkConvoke(MageObjectReference mor, Permanent permanent, Game game) {