From a39f306a65d38aaa978a880e575ddd5cc06429fc Mon Sep 17 00:00:00 2001 From: melvinzhang Date: Sat, 8 Aug 2015 10:17:35 +0800 Subject: [PATCH] fix Colfenor's Urn didn't return any cards to play after it was sacrificed --- release/Magarena/scripts/Colfenor_s_Urn.groovy | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/release/Magarena/scripts/Colfenor_s_Urn.groovy b/release/Magarena/scripts/Colfenor_s_Urn.groovy index 8ab3bd13f3..e68efc1757 100644 --- a/release/Magarena/scripts/Colfenor_s_Urn.groovy +++ b/release/Magarena/scripts/Colfenor_s_Urn.groovy @@ -1,14 +1,16 @@ [ - new MagicWhenOtherDiesTrigger() { + new MagicWhenOtherPutIntoGraveyardTrigger() { @Override - public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPermanent otherPermanent) { - return (otherPermanent.isFriend(permanent) && - otherPermanent.isCreature() && - otherPermanent.getToughness() >= 4) ? + public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MoveCardAction act) { + final MagicCard card = act.card; + return (act.fromLocation == MagicLocationType.Play && + card.isFriend(permanent) && + card.hasType(MagicType.Creature) && + card.getToughness() >= 4) ? new MagicEvent( permanent, new MagicMayChoice(), - otherPermanent, + card, this, "PN may\$ exile RN with SN." ) : @@ -19,7 +21,8 @@ if (event.isYes()) { game.doAction(new ExileLinkAction( event.getPermanent(), - event.getRefPermanent() + event.getRefCard(), + MagicLocationType.Graveyard )); } }