From a75c2694b1ab5e869e222dac2a84381da12fea1f Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sun, 13 Dec 2015 16:59:52 +0100
Subject: [PATCH] * Yomiji, Who Bars the Way - Fixed that it only returned
 creature permanents to hand.

---
 .../sets/betrayersofkamigawa/YomijiWhoBarsTheWay.java | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/YomijiWhoBarsTheWay.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/YomijiWhoBarsTheWay.java
index 510bb6f5ca4..25ea9d5b334 100644
--- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/YomijiWhoBarsTheWay.java
+++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/YomijiWhoBarsTheWay.java
@@ -35,7 +35,7 @@ import mage.abilities.effects.common.ReturnToHandTargetEffect;
 import mage.cards.CardImpl;
 import mage.constants.CardType;
 import mage.constants.Rarity;
-import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.FilterPermanent;
 import mage.filter.predicate.mageobject.SupertypePredicate;
 import mage.filter.predicate.permanent.AnotherPredicate;
 
@@ -45,12 +45,6 @@ import mage.filter.predicate.permanent.AnotherPredicate;
  */
 public class YomijiWhoBarsTheWay extends CardImpl {
 
-    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a legendary permanent other than Yomiji, Who Bars the Way");
-    static {
-        filter.add(new AnotherPredicate());
-        filter.add(new SupertypePredicate("Legendary"));
-    }
-
     public YomijiWhoBarsTheWay(UUID ownerId) {
         super(ownerId, 30, "Yomiji, Who Bars the Way", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{5}{W}{W}");
         this.expansionSetCode = "BOK";
@@ -61,6 +55,9 @@ public class YomijiWhoBarsTheWay extends CardImpl {
         this.toughness = new MageInt(4);
 
         // Whenever a legendary permanent other than Yomiji, Who Bars the Way is put into a graveyard from the battlefield, return that card to its owner's hand.
+        FilterPermanent filter = new FilterPermanent("a legendary permanent other than " + getName());
+        filter.add(new AnotherPredicate());
+        filter.add(new SupertypePredicate("Legendary"));
         Effect effect = new ReturnToHandTargetEffect();
         effect.setText("return that card to its owner's hand");
         this.addAbility(new PutIntoGraveFromBattlefieldAllTriggeredAbility(effect, false, filter, true));