- Added "ClearTriggered" parameter to AF CleanUp.

- Added Shirei, Shizo's Caretaker by marc.

.gitattributes

@@ -7663,6 +7663,7 @@ res/cardsfolder/s/shinen_of_stars_light.txt svneol=native#text/plain
 res/cardsfolder/s/shinewend.txt svneol=native#text/plain
 res/cardsfolder/s/shinka_gatekeeper.txt svneol=native#text/plain
 res/cardsfolder/s/shinka_the_bloodsoaked_keep.txt svneol=native#text/plain
+res/cardsfolder/s/shirei_shizos_caretaker.txt -text
 res/cardsfolder/s/shivan_dragon.txt svneol=native#text/plain
 res/cardsfolder/s/shivan_emissary.txt svneol=native#text/plain
 res/cardsfolder/s/shivan_gorge.txt svneol=native#text/plain

res/cardsfolder/s/shirei_shizos_caretaker.txt

@@ -0,0 +1,15 @@
+Name:Shirei, Shizo's Caretaker
+ManaCost:4 B
+Types:Legendary Creature Spirit
+Text:no text
+PT:2/2
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | TriggerZones$ Battlefield | ValidCard$ Creature.powerLE1+YouOwn | OptionalDecider$ You | DelayedTrigger$ DelTrig | TriggerDescription$ Whenever a creature with power 1 or less is put into your graveyard from the battlefield, you may return that card to the battlefield under your control at the beginning of the next end step if CARDNAME is still on the battlefield.
+SVar:DelTrig:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Player | Execute$ TrigReturn | IsPresent$ Card.Self | PresentZone$ Battlefield | TriggerDescription$ Return creature to the battlefield.
+SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | Defined$ TriggeredCard
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Static$ True | Execute$ DBCleanup
+SVar:DBCleanup:DB$Cleanup | ClearTriggered$ True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/shirei_shizos_caretaker.jpg
+SetInfo:BOK|Rare|http://magiccards.info/scans/en/bok/81.jpg
+Oracle:Whenever a creature with power 1 or less is put into your graveyard from the battlefield, you may return that card to the battlefield under your control at the beginning of the next end step if Shirei, Shizo's Caretaker is still on the battlefield.
+End

src/main/java/forge/card/abilityfactory/AbilityFactoryCleanup.java

@@ -19,6 +19,7 @@ package forge.card.abilityfactory;
 
 import java.util.HashMap;
 
+import forge.AllZone;
 import forge.card.spellability.AbilitySub;
 import forge.card.spellability.SpellAbility;
 
@@ -94,6 +95,9 @@ public final class AbilityFactoryCleanup {
         if (params.containsKey("ClearChosenX")) {
             sa.getSourceCard().setSVar("ChosenX", "");
         }
+        if (params.containsKey("ClearTriggered")) {
+            AllZone.getTriggerHandler().clearDelayedTrigger(sa.getSourceCard());
+        }
     }
 
 } // end class AbilityFactory_Cleanup

src/main/java/forge/card/trigger/TriggerHandler.java

@@ -101,6 +101,24 @@ public class TriggerHandler {
     public final void clearDelayedTrigger() {
         this.delayedTriggers.clear();
     }
+    
+    /**
+     * <p>
+     * clearDelayedTrigger.
+     * </p>
+     * @param card
+     *            a card object.
+     */
+    public final void clearDelayedTrigger(Card card) {
+        ArrayList<Trigger> deltrigs = new ArrayList<Trigger>(this.delayedTriggers);
+        
+        for (Trigger trigger : deltrigs) {
+            if (trigger.getHostCard().equals(card)) {
+                this.delayedTriggers.remove(trigger);
+            }
+        }
+    }
+
 
     /**
      * <p>