diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java index 2bfda3c4a3e..e5200630258 100644 --- a/forge-game/src/main/java/forge/game/GameAction.java +++ b/forge-game/src/main/java/forge/game/GameAction.java @@ -604,20 +604,6 @@ public class GameAction { c.setTurnInZone(tiz); c.setCameUnderControlSinceLastUpkeep(true); - // check for related effects and correct their controller and zone if necessary - for (Card eff : game.getCardsIn(ZoneType.Command)) { - if (eff.getType().hasSubtype("Effect")) { - boolean moveWithImprinted = eff.hasSVar("MoveWithImprinted") && eff.getImprintedCards() != null && eff.getImprintedCards().contains(c); - boolean moveWithRemembered = eff.hasSVar("MoveWithRemembered") && eff.getRemembered() != null && (Iterables.contains(eff.getRemembered(), c)); - - if (moveWithImprinted || moveWithRemembered) { - eff.setController(c.getController(), game.getNextTimestamp()); - eff.getZone().remove(eff); - c.getController().getZone(ZoneType.Command).add(eff); - } - } - } - final Map runParams = Maps.newHashMap(); runParams.put("Card", c); runParams.put("OriginalController", original); diff --git a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java index 93db64a5b65..74727440305 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java @@ -112,14 +112,6 @@ public class EffectEffect extends SpellAbilityEffect { final Card eff = createEffect(hostCard, controller, name, image); - // For effects that need to change their controller and zone together with the card remembered/imprinted on them - if (sa.hasParam("MoveWithRemembered")) { - eff.setSVar("MoveWithRemembered", "True"); - } - if (sa.hasParam("MoveWithImprinted")) { - eff.setSVar("MoveWithImprinted", "True"); - } - // Grant SVars first in order to give references to granted abilities if (effectSVars != null) { for (final String s : effectSVars) {