From bea96b6aaf638f8bbb2821fbe9c00b07e5d98a29 Mon Sep 17 00:00:00 2001 From: Hanmac Date: Fri, 8 Jul 2016 11:17:03 +0000 Subject: [PATCH] CloneEffect: SetPower and SetToughness should overwrite CDA and they should not copied. --- .../java/forge/game/ability/effects/CloneEffect.java | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 f9d319bb3f8..661f51e8512 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 @@ -14,6 +14,7 @@ import forge.game.card.CardUtil; import forge.game.event.GameEventCardStatsChanged; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; +import forge.game.staticability.StaticAbility; import forge.game.trigger.Trigger; import forge.game.trigger.TriggerHandler; @@ -266,6 +267,11 @@ public class CloneEffect extends SpellAbilityEffect { } catch (final NumberFormatException e) { power = CardFactoryUtil.xCount(tgtCard, tgtCard.getSVar(rhs)); } + for (StaticAbility sta : tgtCard.getStaticAbilities()) { + Map params = sta.getMapParams(); + if (params.containsKey("CharacteristicDefining") && params.containsKey("SetPower")) + tgtCard.removeStaticAbility(sta); + } tgtCard.setBasePower(power); } @@ -278,6 +284,11 @@ public class CloneEffect extends SpellAbilityEffect { } catch (final NumberFormatException e) { toughness = CardFactoryUtil.xCount(tgtCard, tgtCard.getSVar(rhs)); } + for (StaticAbility sta : tgtCard.getStaticAbilities()) { + Map params = sta.getMapParams(); + if (params.containsKey("CharacteristicDefining") && params.containsKey("SetToughness")) + tgtCard.removeStaticAbility(sta); + } tgtCard.setBaseToughness(toughness); }