rename SelfPutIntoGraveyardTrigger to ThisPutIntoGraveyardTrigger

release/Magarena/scripts/Nissa_s_Chosen.groovy

@@ -1,5 +1,5 @@
 [
-    new SelfPutIntoGraveyardTrigger(MagicTrigger.REPLACEMENT) {
+    new ThisPutIntoGraveyardTrigger(MagicTrigger.REPLACEMENT) {
         @Override
         public MagicEvent executeTrigger(final MagicGame game, final MagicPermanent permanent, final MoveCardAction act) {
             act.setToLocation(MagicLocationType.BottomOfOwnersLibrary);

src/magic/model/MagicAbility.java

@@ -504,12 +504,12 @@ public enum MagicAbility {
     },
     OpponentDiscardOntoBattlefield("If a spell or ability an opponent controls causes you to discard SN, put it onto the battlefield instead of putting it into your graveyard\\.",10) {
         protected void addAbilityImpl(final MagicAbilityStore card, final Matcher arg) {
-            card.add(SelfPutIntoGraveyardTrigger.OpponentDiscardOntoBattlefield);
+            card.add(ThisPutIntoGraveyardTrigger.OpponentDiscardOntoBattlefield);
         }
     },
     RecoverGraveyard("When SN is put into a graveyard from anywhere, its owner shuffles his or her graveyard into his or her library\\.",10) {
         protected void addAbilityImpl(final MagicAbilityStore card, final Matcher arg) {
-            card.add(SelfPutIntoGraveyardTrigger.RecoverGraveyard);
+            card.add(ThisPutIntoGraveyardTrigger.RecoverGraveyard);
         }
     },
     GraveyardToLibrary("When SN is put into a graveyard from anywhere, shuffle it into its owner's library\\.",10) {
@@ -519,7 +519,7 @@ public enum MagicAbility {
     },
     LibraryInteadOfGraveyard("If SN would be put into a graveyard from anywhere, reveal SN and shuffle it into its owner's library instead\\.",10) {
         protected void addAbilityImpl(final MagicAbilityStore card, final Matcher arg) {
-            card.add(SelfPutIntoGraveyardTrigger.LibraryInsteadOfGraveyard);
+            card.add(ThisPutIntoGraveyardTrigger.LibraryInsteadOfGraveyard);
         }
     },
     EntersChooseOpponent("As SN enters the battlefield, choose an opponent\\.", 0) {

src/magic/model/MagicCardDefinition.java

@@ -20,7 +20,7 @@ import magic.model.trigger.MagicTrigger;
 import magic.model.trigger.EntersBattlefieldTrigger;
 import magic.model.trigger.EntersWithCounterTrigger;
 import magic.model.trigger.MagicWhenDrawnTrigger;
-import magic.model.trigger.SelfPutIntoGraveyardTrigger;
+import magic.model.trigger.ThisPutIntoGraveyardTrigger;
 import magic.model.trigger.ThisSpellIsCastTrigger;
 import magic.model.trigger.MagicWhenCycleTrigger;
 
@@ -100,7 +100,7 @@ public class MagicCardDefinition implements MagicAbilityStore {
     private final Collection<ThisSpellIsCastTrigger> spellIsCastTriggers = new ArrayList<ThisSpellIsCastTrigger>();
     private final Collection<MagicWhenCycleTrigger> cycleTriggers = new ArrayList<MagicWhenCycleTrigger>();
     private final Collection<MagicWhenDrawnTrigger> drawnTriggers = new ArrayList<MagicWhenDrawnTrigger>();
-    private final Collection<SelfPutIntoGraveyardTrigger> putIntoGraveyardTriggers = new ArrayList<SelfPutIntoGraveyardTrigger>();
+    private final Collection<ThisPutIntoGraveyardTrigger> putIntoGraveyardTriggers = new ArrayList<ThisPutIntoGraveyardTrigger>();
     private final Collection<MagicManaActivation> manaActivations=new ArrayList<MagicManaActivation>();
     private final Collection<MagicEventSource> costEventSources=new ArrayList<MagicEventSource>();
 
@@ -833,7 +833,7 @@ public class MagicCardDefinition implements MagicAbilityStore {
         }
     }
 
-    public void addTrigger(final SelfPutIntoGraveyardTrigger trigger) {
+    public void addTrigger(final ThisPutIntoGraveyardTrigger trigger) {
         putIntoGraveyardTriggers.add(trigger);
     }
 
@@ -869,7 +869,7 @@ public class MagicCardDefinition implements MagicAbilityStore {
         return comeIntoPlayTriggers;
     }
 
-    public Collection<SelfPutIntoGraveyardTrigger> getPutIntoGraveyardTriggers() {
+    public Collection<ThisPutIntoGraveyardTrigger> getPutIntoGraveyardTriggers() {
         return putIntoGraveyardTriggers;
     }
 

src/magic/model/trigger/FromGraveyardIntoLibraryTrigger.java

@@ -8,7 +8,7 @@ import magic.model.action.MoveCardAction;
 import magic.model.action.ShiftCardAction;
 import magic.model.event.MagicEvent;
 
-public class FromGraveyardIntoLibraryTrigger extends SelfPutIntoGraveyardTrigger {
+public class FromGraveyardIntoLibraryTrigger extends ThisPutIntoGraveyardTrigger {
 
     private static final FromGraveyardIntoLibraryTrigger INSTANCE = new FromGraveyardIntoLibraryTrigger();
 

src/magic/model/trigger/MadnessTrigger.java

@@ -14,7 +14,7 @@ import magic.model.choice.MagicPayManaCostChoice;
 import magic.model.event.MagicEvent;
 import magic.model.event.MagicEventAction;
 
-public class MadnessTrigger extends SelfPutIntoGraveyardTrigger {
+public class MadnessTrigger extends ThisPutIntoGraveyardTrigger {
 
     private final MagicManaCost cost;
 

src/magic/model/trigger/ThisPutIntoGraveyardTrigger.java

@@ -13,12 +13,12 @@ import magic.model.action.PlayCardAction;
 import magic.model.action.RevealAction;
 import magic.model.event.MagicEvent;
 
-public abstract class SelfPutIntoGraveyardTrigger extends MagicTrigger<MoveCardAction> {
-    public SelfPutIntoGraveyardTrigger(final int priority) {
+public abstract class ThisPutIntoGraveyardTrigger extends MagicTrigger<MoveCardAction> {
+    public ThisPutIntoGraveyardTrigger(final int priority) {
         super(priority);
     }
 
-    public SelfPutIntoGraveyardTrigger() {}
+    public ThisPutIntoGraveyardTrigger() {}
 
     @Override
     public MagicTriggerType getType() {
@@ -35,7 +35,7 @@ public abstract class SelfPutIntoGraveyardTrigger extends MagicTrigger<MoveCardA
         cdef.addTrigger(this);
     }
 
-    public static final SelfPutIntoGraveyardTrigger LibraryInsteadOfGraveyard = new SelfPutIntoGraveyardTrigger(MagicTrigger.REPLACEMENT) {
+    public static final ThisPutIntoGraveyardTrigger LibraryInsteadOfGraveyard = new ThisPutIntoGraveyardTrigger(MagicTrigger.REPLACEMENT) {
         @Override
         public MagicEvent executeTrigger(final MagicGame game, final MagicPermanent permanent, final MoveCardAction act) {
             game.doAction(new RevealAction(act.card));
@@ -44,7 +44,7 @@ public abstract class SelfPutIntoGraveyardTrigger extends MagicTrigger<MoveCardA
         }
     };
 
-    public static final SelfPutIntoGraveyardTrigger OpponentDiscardOntoBattlefield = new SelfPutIntoGraveyardTrigger(MagicTrigger.REPLACEMENT) {
+    public static final ThisPutIntoGraveyardTrigger OpponentDiscardOntoBattlefield = new ThisPutIntoGraveyardTrigger(MagicTrigger.REPLACEMENT) {
         @Override
         public MagicEvent executeTrigger(final MagicGame game, final MagicPermanent permanent, final MoveCardAction act) {
             final MagicCard card = act.card;
@@ -58,7 +58,7 @@ public abstract class SelfPutIntoGraveyardTrigger extends MagicTrigger<MoveCardA
         }
     };
 
-    public static final SelfPutIntoGraveyardTrigger RecoverGraveyard = new SelfPutIntoGraveyardTrigger() {
+    public static final ThisPutIntoGraveyardTrigger RecoverGraveyard = new ThisPutIntoGraveyardTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game, final MagicPermanent permanent, final MoveCardAction act) {
             final MagicPlayer owner = act.card.getOwner();