diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index 6e276cc3f7b..0019b839879 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -565,9 +565,11 @@ public class Card extends GameEntity implements Comparable { public final void setTriggers(final ArrayList trigs) { ArrayList copyList = new ArrayList(); for (Trigger t : trigs) { - Trigger newtrig = t.getCopy(); - newtrig.setHostCard(this); - copyList.add(newtrig); + if(t.getIsIntrinsic()) { + Trigger newtrig = t.getCopy(); + newtrig.setHostCard(this); + copyList.add(newtrig); + } } getCharacteristics().setTriggers(copyList); diff --git a/src/main/java/forge/Gui_DownloadPictures_LQ.java b/src/main/java/forge/Gui_DownloadPictures_LQ.java index 4703c5804d1..f3ba1ea82fa 100644 --- a/src/main/java/forge/Gui_DownloadPictures_LQ.java +++ b/src/main/java/forge/Gui_DownloadPictures_LQ.java @@ -46,9 +46,6 @@ public class Gui_DownloadPictures_LQ extends GuiDownloader { String base = ForgeProps.getFile(IMAGE_BASE).getPath(); for (Card c : AllZone.getCardFactory()) { - if (c.getName().equals("Gatstaf Shepherd")) { - System.out.println("Heyo!"); - } cList.addAll(createDLObjects(c, base)); if (c.hasAlternateState()) { c.changeState(); diff --git a/src/main/java/forge/card/cardFactory/AbstractCardFactory.java b/src/main/java/forge/card/cardFactory/AbstractCardFactory.java index 891009829c4..58ac00e3188 100644 --- a/src/main/java/forge/card/cardFactory/AbstractCardFactory.java +++ b/src/main/java/forge/card/cardFactory/AbstractCardFactory.java @@ -193,10 +193,6 @@ public abstract class AbstractCardFactory implements NewConstants, CardFactoryIn out.addRemembered(o); } - out.clearTriggersNew(); - for (Trigger trigger : in.getTriggers()) { - out.moveTrigger(trigger); - } return out; }