fixed Monstrous Step targeting

This commit is contained in:
Evan Kranzler 2020-04-23 20:06:03 -04:00
parent 862cdf5420
commit 1ad3a0f768

View file

@ -75,12 +75,11 @@ class MonstrousStepEffect extends RequirementEffect {
@Override @Override
public boolean applies(Permanent permanent, Ability source, Game game) { public boolean applies(Permanent permanent, Ability source, Game game) {
BlockedAttackerWatcher watcher = game.getState().getWatcher(BlockedAttackerWatcher.class); BlockedAttackerWatcher watcher = game.getState().getWatcher(BlockedAttackerWatcher.class);
if (watcher == null return permanent != null
|| watcher.creatureHasBlockedAttacker(game.getPermanent(source.getFirstTarget()), permanent, game) && watcher != null
|| !permanent.getId().equals(source.getTargets().get(1).getFirstTarget())) { && !watcher.creatureHasBlockedAttacker(game.getPermanent(source.getFirstTarget()), permanent, game)
return permanent.canBlock(source.getFirstTarget(), game); && permanent.getId().equals(source.getTargets().get(1).getFirstTarget())
} && permanent.canBlock(source.getFirstTarget(), game);
return false;
} }
@Override @Override