diff --git a/src/main/java/forge/card/trigger/TriggerHandler.java b/src/main/java/forge/card/trigger/TriggerHandler.java index 0a4566c374a..d13301a6faf 100644 --- a/src/main/java/forge/card/trigger/TriggerHandler.java +++ b/src/main/java/forge/card/trigger/TriggerHandler.java @@ -244,11 +244,12 @@ public class TriggerHandler { List playerCards = player.getAllCards(); // check LKI copies for triggers - if (runParams.containsKey("Destination") && runParams.containsKey("Card")) { + if (runParams.containsKey("Destination") && !ZoneType.Battlefield.name().equals(runParams.get("Destination")) + && runParams.containsKey("Card")) { Card card = (Card) runParams.get("Card"); if (card.getController() == player) { for (final Trigger t : card.getTriggers()) { - if (!t.isStatic() && !t.isIntrinsic() && canRunTrigger(t, mode, runParams)) { + if (!t.isStatic() && (card.isToken() || !t.isIntrinsic()) && canRunTrigger(t, mode, runParams)) { this.runSingleTrigger(t, runParams); checkStatics = true; }