From 04d4e2cfd8e16921bb4043fbcf8445493487db99 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 5 Sep 2014 12:46:39 +0200 Subject: [PATCH] Some minor changes to cards. --- Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java | 2 +- Mage.Sets/src/mage/sets/timespiral/NorinTheWary.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java b/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java index 1c5f1b25c80..3d898de6f47 100644 --- a/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java +++ b/Mage.Sets/src/mage/sets/returntoravnica/SkymarkRoc.java @@ -93,7 +93,7 @@ class SkymarkRocAbility extends TriggeredAbilityImpl { public boolean checkTrigger(GameEvent event, Game game) { if (event.getType() == GameEvent.EventType.ATTACKER_DECLARED && event.getSourceId().equals(this.getSourceId())) { FilterCreaturePermanent filter = new FilterCreaturePermanent("creature defending player controls with toughness 2 or less"); - UUID defenderId = game.getCombat().getDefenderId(sourceId); + UUID defenderId = game.getCombat().getDefendingPlayerId(sourceId, game); filter.add(new ControllerIdPredicate(defenderId)); filter.add(new ToughnessPredicate(Filter.ComparisonType.LessThan, 3)); diff --git a/Mage.Sets/src/mage/sets/timespiral/NorinTheWary.java b/Mage.Sets/src/mage/sets/timespiral/NorinTheWary.java index babed4c1a60..7ad2e4f6823 100644 --- a/Mage.Sets/src/mage/sets/timespiral/NorinTheWary.java +++ b/Mage.Sets/src/mage/sets/timespiral/NorinTheWary.java @@ -133,9 +133,9 @@ class NorinTheWaryRemovingEffect extends OneShotEffect { delayedAbility.setSourceId(source.getSourceId()); delayedAbility.setControllerId(source.getControllerId()); game.addDelayedTriggeredAbility(delayedAbility); - return true; } - } + } + return true; } return false; }