From 71825043c556a7f4ec49eef67c387193fa2f264d Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 23 Oct 2015 07:52:04 +0200 Subject: [PATCH] * Enduring Scalelord - Fixed triggered ability not working for replcament effects adding counters to permenents entering the battlefield. --- .../src/mage/sets/dragonsoftarkir/EnduringScalelord.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/EnduringScalelord.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/EnduringScalelord.java index a73926993d..92ea2e6444 100644 --- a/Mage.Sets/src/mage/sets/dragonsoftarkir/EnduringScalelord.java +++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/EnduringScalelord.java @@ -92,12 +92,15 @@ class EnduringScalelordTriggeredAbility extends TriggeredAbilityImpl { return event.getType() == GameEvent.EventType.COUNTERS_ADDED; } - @Override public boolean checkTrigger(GameEvent event, Game game) { if (event.getData().equals(CounterType.P1P1.getName())) { Permanent permanent = game.getPermanentOrLKIBattlefield(event.getTargetId()); - return (!event.getTargetId().equals(this.getSourceId()) + if (permanent == null) { + permanent = game.getPermanentEntering(event.getTargetId()); + } + return (permanent != null + && !event.getTargetId().equals(this.getSourceId()) && permanent.getCardType().contains(CardType.CREATURE) && permanent.getControllerId().equals(this.getControllerId())); }