From 1179ca6874b21467a83c15bed034d66256e5bb1a Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Fri, 25 Aug 2023 19:26:54 +0400 Subject: [PATCH] Evolving Adaptive - fixed game error on card's remove/blink (NPE error); --- Mage.Sets/src/mage/cards/e/EvolvingAdaptive.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/cards/e/EvolvingAdaptive.java b/Mage.Sets/src/mage/cards/e/EvolvingAdaptive.java index 54a9f83b8a6..f95c3d51696 100644 --- a/Mage.Sets/src/mage/cards/e/EvolvingAdaptive.java +++ b/Mage.Sets/src/mage/cards/e/EvolvingAdaptive.java @@ -83,10 +83,13 @@ class EvolvingAdaptiveTriggeredAbility extends TriggeredAbilityImpl { @Override public boolean checkTrigger(GameEvent event, Game game) { Permanent enteringCreature = game.getPermanent(event.getTargetId()); - if (enteringCreature == null || !StaticFilters.FILTER_ANOTHER_CREATURE_YOU_CONTROL.match(enteringCreature, getControllerId(), this, game)) { + Permanent permanent = getSourcePermanentIfItStillExists(game); + if (enteringCreature == null + || permanent == null + || !StaticFilters.FILTER_ANOTHER_CREATURE_YOU_CONTROL.match(enteringCreature, getControllerId(), this, game)) { return false; } - Permanent permanent = getSourcePermanentIfItStillExists(game); + return !(enteringCreature.getPower().getValue() <= permanent.getPower().getValue() && enteringCreature.getToughness().getValue() <= permanent.getToughness().getValue()); }