From 1e546f1ec8cb181e4d6b3f8cbecd12442b25e92b Mon Sep 17 00:00:00 2001 From: Agetian Date: Sun, 22 Nov 2015 06:02:31 +0000 Subject: [PATCH] - Somewhat better structuring of the fix from the previous commit. --- .../src/main/java/forge/game/ability/effects/CharmEffect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java index a25c0a3247c..1db796c40fd 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java @@ -100,10 +100,10 @@ public class CharmEffect extends SpellAbilityEffect { for (AbilitySub sub : chosen) { // Clone the chosen, just in case the some subAb gets chosen multiple times AbilitySub clone = (AbilitySub)sub.getCopy(); - clone.setTargets(sub.getTargets()); saDeepest.setSubAbility(clone); clone.setActivatingPlayer(saDeepest.getActivatingPlayer()); + clone.setTargets(sub.getTargets()); // do not forget what was targeted by the subability clone.setParent(saDeepest); // to chain the next one (but make sure it goes all the way at the end of the SA chain)