From 1ad3a0f7680ef9fe043089b55cbc0e244cc6359c Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Thu, 23 Apr 2020 20:06:03 -0400 Subject: [PATCH] fixed Monstrous Step targeting --- Mage.Sets/src/mage/cards/m/MonstrousStep.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Mage.Sets/src/mage/cards/m/MonstrousStep.java b/Mage.Sets/src/mage/cards/m/MonstrousStep.java index f2aee31a348..3224d2450a1 100644 --- a/Mage.Sets/src/mage/cards/m/MonstrousStep.java +++ b/Mage.Sets/src/mage/cards/m/MonstrousStep.java @@ -75,12 +75,11 @@ class MonstrousStepEffect extends RequirementEffect { @Override public boolean applies(Permanent permanent, Ability source, Game game) { BlockedAttackerWatcher watcher = game.getState().getWatcher(BlockedAttackerWatcher.class); - if (watcher == null - || watcher.creatureHasBlockedAttacker(game.getPermanent(source.getFirstTarget()), permanent, game) - || !permanent.getId().equals(source.getTargets().get(1).getFirstTarget())) { - return permanent.canBlock(source.getFirstTarget(), game); - } - return false; + return permanent != null + && watcher != null + && !watcher.creatureHasBlockedAttacker(game.getPermanent(source.getFirstTarget()), permanent, game) + && permanent.getId().equals(source.getTargets().get(1).getFirstTarget()) + && permanent.canBlock(source.getFirstTarget(), game); } @Override