[TSP] fixed implementation of Weatherseed Totem

Mage.Sets/src/mage/cards/w/WeatherseedTotem.java

@@ -1,15 +1,12 @@
-
 package mage.cards.w;
 
-import java.util.UUID;
-import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.PutIntoGraveFromBattlefieldSourceTriggeredAbility;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.condition.Condition;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility;
-import mage.abilities.effects.common.ReturnToHandSourceEffect;
+import mage.abilities.effects.common.ReturnSourceFromGraveyardToHandEffect;
 import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect;
 import mage.abilities.keyword.TrampleAbility;
 import mage.abilities.mana.GreenManaAbility;
@@ -18,13 +15,13 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.SubType;
-import mage.constants.Zone;
 import mage.game.Game;
-import mage.game.permanent.Permanent;
+import mage.game.permanent.token.custom.CreatureToken;
-import mage.game.permanent.token.TokenImpl;
+
+import java.util.Objects;
+import java.util.UUID;
 
 /**
- *
  * @author TheElk801
  */
 public final class WeatherseedTotem extends CardImpl {
@@ -36,13 +33,19 @@ public final class WeatherseedTotem extends CardImpl {
         this.addAbility(new GreenManaAbility());
 
         // {2}{G}{G}{G}: Weatherseed Totem becomes a 5/3 green Treefolk artifact creature with trample until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new WeatherseedTotemToken(), "", Duration.EndOfTurn), new ManaCostsImpl<>("{2}{G}{G}{G}")));
+        this.addAbility(new SimpleActivatedAbility(new BecomesCreatureSourceEffect(
+                new CreatureToken(5, 3, "5/3 green Treefolk artifact creature with trample")
+                        .withColor("G")
+                        .withSubType(SubType.TREEFOLK)
+                        .withType(CardType.ARTIFACT)
+                        .withAbility(TrampleAbility.getInstance()),
+                "", Duration.EndOfTurn
+        ), new ManaCostsImpl<>("{2}{G}{G}{G}")));
 
         // When Weatherseed Totem is put into a graveyard from the battlefield, if it was a creature, return this card to its owner's hand.
         this.addAbility(new ConditionalInterveningIfTriggeredAbility(
-                new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new ReturnToHandSourceEffect()),
+                new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new ReturnSourceFromGraveyardToHandEffect()),
-                new WeatherseedTotemCondition(),
+                WeatherseedTotemCondition.instance, "When {this} is put into a graveyard from the battlefield, "
-                "When {this} is put into a graveyard from the battlefield, "
                 + "if it was a creature, return this card to its owner's hand"
         ));
     }
@@ -57,38 +60,16 @@ public final class WeatherseedTotem extends CardImpl {
     }
 }
 
-class WeatherseedTotemCondition implements Condition {
+enum WeatherseedTotemCondition implements Condition {
-
+    instance;
-    public WeatherseedTotemCondition() {
-    }
 
     @Override
     public boolean apply(Game game, Ability source) {
-        Permanent permanent = game.getPermanentOrLKIBattlefield(source.getSourceId());
+        return source
-        if (permanent != null) {
+                .getEffects()
-            return permanent.isCreature(game);
+                .stream()
-        }
+                .map(effect -> effect.getValue("permanentWasCreature"))
-        return false;
+                .filter(Objects::nonNull)
-    }
+                .anyMatch(Boolean.class::cast);
-}
-
-class WeatherseedTotemToken extends TokenImpl {
-
-    public WeatherseedTotemToken() {
-        super("", "5/3 green Treefolk artifact creature with trample");
-        cardType.add(CardType.CREATURE);
-        cardType.add(CardType.ARTIFACT);
-        subtype.add(SubType.TREEFOLK);
-        color.setGreen(true);
-        power = new MageInt(5);
-        toughness = new MageInt(3);
-        this.addAbility(TrampleAbility.getInstance());
-    }
-    public WeatherseedTotemToken(final WeatherseedTotemToken token) {
-        super(token);
-    }
-
-    public WeatherseedTotemToken copy() {
-        return new WeatherseedTotemToken(this);
     }
 }

Mage.Tests/src/test/java/org/mage/test/cards/single/tsp/WeatherseedTotemTest.java

@@ -0,0 +1,52 @@
+package org.mage.test.cards.single.tsp;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ * @author TheElk801
+ */
+public class WeatherseedTotemTest extends CardTestPlayerBase {
+    private static final String totem = "Weatherseed Totem";
+    private static final String naturalize = "Naturalize";
+
+    @Test
+    public void testNonCreature() {
+        addCard(Zone.BATTLEFIELD, playerA, "Forest", 2);
+        addCard(Zone.BATTLEFIELD, playerA, totem);
+        addCard(Zone.HAND, playerA, naturalize);
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, naturalize, totem);
+
+        setStrictChooseMode(true);
+        setStopAt(1, PhaseStep.END_TURN);
+        execute();
+        assertAllCommandsUsed();
+
+        assertHandCount(playerA, totem, 0);
+        assertGraveyardCount(playerA, totem, 1);
+        assertGraveyardCount(playerA, naturalize, 1);
+    }
+
+    @Test
+    public void testCreature() {
+        addCard(Zone.BATTLEFIELD, playerA, "Forest", 7);
+        addCard(Zone.BATTLEFIELD, playerA, totem);
+        addCard(Zone.HAND, playerA, naturalize);
+
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{2}{G}{G}{G}");
+
+        castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerA, naturalize, totem);
+
+        setStrictChooseMode(true);
+        setStopAt(1, PhaseStep.END_TURN);
+        execute();
+        assertAllCommandsUsed();
+
+        assertHandCount(playerA, totem, 1);
+        assertGraveyardCount(playerA, totem, 0);
+        assertGraveyardCount(playerA, naturalize, 1);
+    }
+}

Mage/src/main/java/mage/abilities/common/PutIntoGraveFromBattlefieldSourceTriggeredAbility.java

@@ -13,7 +13,7 @@ import mage.game.permanent.Permanent;
  */
 public class PutIntoGraveFromBattlefieldSourceTriggeredAbility extends TriggeredAbilityImpl {
 
-    private boolean onlyToControllerGraveyard;
+    private final boolean onlyToControllerGraveyard;
 
     public PutIntoGraveFromBattlefieldSourceTriggeredAbility(Effect effect) {
         this(effect, false, false);
@@ -42,19 +42,21 @@ public class PutIntoGraveFromBattlefieldSourceTriggeredAbility extends Triggered
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (event.getTargetId().equals(getSourceId())) {
+        if (!event.getTargetId().equals(getSourceId())) {
-            ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
+            return false;
-            Permanent permanent = zEvent.getTarget();
-            if (permanent != null
-                    && zEvent.isDiesEvent()) {
-                return !onlyToControllerGraveyard || this.isControlledBy(game.getOwnerId(zEvent.getTargetId()));
-            }
         }
-        return false;
+        ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
+        Permanent permanent = zEvent.getTarget();
+        if (permanent == null || !zEvent.isDiesEvent()
+                || (onlyToControllerGraveyard && !this.isControlledBy(game.getOwnerId(zEvent.getTargetId())))) {
+            return false;
+        }
+        this.getEffects().setValue("permanentWasCreature", permanent.isCreature(game));
+        return true;
     }
 
     @Override
     public String getTriggerPhrase() {
-        return "When {this} is put into " + (onlyToControllerGraveyard ? "your" : "a") + " graveyard from the battlefield, " ;
+        return "When {this} is put into " + (onlyToControllerGraveyard ? "your" : "a") + " graveyard from the battlefield, ";
     }
 }