From 4eca4decac561f3d75a38eb926c3912964eeb5b4 Mon Sep 17 00:00:00 2001 From: elcnesh Date: Wed, 25 Jun 2014 08:34:44 +0000 Subject: [PATCH] Fix copy effects so that added triggers (eg. Dethrone from Dack's Duplicate) function again. --- .../main/java/forge/game/ability/effects/CloneEffect.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/CloneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CloneEffect.java index 2b6e33a5673..a8e1aa7f182 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CloneEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CloneEffect.java @@ -124,9 +124,11 @@ public class CloneEffect extends SpellAbilityEffect { cardToCopy.setState(origState); } - // must call this before addAbilityFactoryAbilities so cloned added abilities are handled correctly - addExtraCharacteristics(tgtCard, sa, origSVars); + // must copy abilities before first so cloned added abilities are handled correctly CardFactory.copyCopiableAbilities(cardToCopy, tgtCard); + + // add extra abilities as granted by the copy effect + addExtraCharacteristics(tgtCard, sa, origSVars); // restore name if it should be unchanged if (keepName) {