From ead08ebdc39bded4b62dd089ff5a10dad8e6b735 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 2 Jul 2015 09:25:42 +0200 Subject: [PATCH] [ORI] Fixed Erebos Titan trigger card selection. --- Mage.Sets/src/mage/sets/magicorigins/ErebosTitan.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Mage.Sets/src/mage/sets/magicorigins/ErebosTitan.java b/Mage.Sets/src/mage/sets/magicorigins/ErebosTitan.java index 0ad18c4d43..04ed9f4718 100644 --- a/Mage.Sets/src/mage/sets/magicorigins/ErebosTitan.java +++ b/Mage.Sets/src/mage/sets/magicorigins/ErebosTitan.java @@ -45,9 +45,7 @@ import mage.constants.Duration; import mage.constants.Rarity; import mage.constants.TargetController; import mage.constants.Zone; -import mage.filter.common.FilterCreatureCard; import mage.filter.common.FilterCreaturePermanent; -import mage.filter.predicate.other.OwnerPredicate; import mage.filter.predicate.permanent.ControllerPredicate; import mage.game.Game; import mage.game.events.GameEvent; @@ -61,11 +59,9 @@ import mage.players.Player; public class ErebosTitan extends CardImpl { private final static FilterCreaturePermanent filter = new FilterCreaturePermanent(); - private final static FilterCreatureCard filterCard = new FilterCreatureCard(); static { filter.add(new ControllerPredicate(TargetController.OPPONENT)); - filter.add(new OwnerPredicate(TargetController.OPPONENT)); } public ErebosTitan(UUID ownerId) { @@ -122,7 +118,10 @@ class ErebosTitanTriggeredAbility extends TriggeredAbilityImpl { if (zEvent.getFromZone().equals(Zone.GRAVEYARD)) { Card card = game.getCard(zEvent.getTargetId()); Player controller = game.getPlayer(getControllerId()); - return card != null && controller != null && controller.hasOpponent(card.getOwnerId(), game); + return card != null + && card.getCardType().contains(CardType.CREATURE) + && controller != null + && controller.hasOpponent(card.getOwnerId(), game); } return false; }