From b39423914e327fa2c443a4b82309d95cb86dadea Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Wed, 23 Sep 2020 19:56:04 -0400 Subject: [PATCH] [ZNR] fixed Skyclave Pickaxe null pointer exception (fixes #7081) --- Mage.Sets/src/mage/cards/s/SkyclavePickAxe.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/cards/s/SkyclavePickAxe.java b/Mage.Sets/src/mage/cards/s/SkyclavePickAxe.java index 8aa004f3dbf..615fdb66ce4 100644 --- a/Mage.Sets/src/mage/cards/s/SkyclavePickAxe.java +++ b/Mage.Sets/src/mage/cards/s/SkyclavePickAxe.java @@ -73,11 +73,11 @@ class SkyclavePickAxeEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Permanent permanent = game.getPermanentOrLKIBattlefield(source.getSourceId()); - if (permanent == null) { + if (permanent == null || game.getPermanent(permanent.getAttachedTo()) == null) { return false; } game.addEffect(new BoostTargetEffect(2, 2).setTargetPointer( - new FixedTarget(game.getPermanent(permanent.getAttachedTo()), game) + new FixedTarget(permanent.getAttachedTo(), game) ), source); return true; }