From 0f37405480efd49af7ea1db0b927aed039ccf591 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 20 Mar 2015 18:07:35 +0100 Subject: [PATCH] * Deathmist Raptor - Fixed a bug that the ability to return it from graveyard did not trigger. --- .../src/mage/sets/dragonsoftarkir/DeathmistRaptor.java | 2 +- .../abilities/common/TurnedFaceUpAllTriggeredAbility.java | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Mage.Sets/src/mage/sets/dragonsoftarkir/DeathmistRaptor.java b/Mage.Sets/src/mage/sets/dragonsoftarkir/DeathmistRaptor.java index b3aec80aac8..ffde7596bcb 100644 --- a/Mage.Sets/src/mage/sets/dragonsoftarkir/DeathmistRaptor.java +++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/DeathmistRaptor.java @@ -101,7 +101,7 @@ class DeathmistRaptorEffect extends OneShotEffect { Card card = game.getCard(source.getSourceId()); if (controller != null && card != null) { controller.putOntoBattlefieldWithInfo(card, game, Zone.GRAVEYARD, source.getSourceId(), false, - controller.chooseUse(Outcome.Detriment, "Return " + card.getName() + " face down to battlefield?", game)); + controller.chooseUse(Outcome.Detriment, "Return " + card.getName() + " face down to battlefield (otherwise face up)?", game)); return true; } return false; diff --git a/Mage/src/mage/abilities/common/TurnedFaceUpAllTriggeredAbility.java b/Mage/src/mage/abilities/common/TurnedFaceUpAllTriggeredAbility.java index 367388fc069..1be59270626 100644 --- a/Mage/src/mage/abilities/common/TurnedFaceUpAllTriggeredAbility.java +++ b/Mage/src/mage/abilities/common/TurnedFaceUpAllTriggeredAbility.java @@ -28,8 +28,10 @@ package mage.abilities.common; +import mage.MageObject; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.effects.Effect; +import mage.cards.Card; import mage.constants.Zone; import mage.filter.FilterPermanent; import mage.game.Game; @@ -82,9 +84,9 @@ public class TurnedFaceUpAllTriggeredAbility extends TriggeredAbilityImpl { @Override public boolean checkTrigger(GameEvent event, Game game) { if (!event.getTargetId().equals(getSourceId())) { - Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(getSourceId()); - if (sourcePermanent != null) { - if (sourcePermanent.isFaceDown(game)) { + MageObject sourceObj = this.getSourceObject(game); + if (sourceObj != null) { + if (sourceObj instanceof Card && ((Card)sourceObj).isFaceDown(game)) { // if face down and it's not itself that is turned face up, it does not trigger return false; }