diff --git a/Mage/src/mage/abilities/effects/common/CopyTargetSpellEffect.java b/Mage/src/mage/abilities/effects/common/CopyTargetSpellEffect.java index c6db5a9547..51592e3e67 100644 --- a/Mage/src/mage/abilities/effects/common/CopyTargetSpellEffect.java +++ b/Mage/src/mage/abilities/effects/common/CopyTargetSpellEffect.java @@ -35,6 +35,7 @@ import mage.abilities.Mode; import mage.abilities.effects.OneShotEffect; import mage.game.Game; import mage.game.stack.Spell; +import mage.players.Player; /** * @author BetaSteward_at_googlemail.com @@ -59,6 +60,12 @@ public class CopyTargetSpellEffect extends OneShotEffect copy.setCopiedSpell(true); game.getStack().push(copy); copy.chooseNewTargets(game, source.getControllerId()); + Player player = game.getPlayer(source.getControllerId()); + String activateMessage = copy.getSpellAbility().getActivatedMessage(game); + if (activateMessage.startsWith(" casts ")) { + activateMessage = activateMessage.substring(6); + } + game.informPlayers(player.getName() + " copies " + activateMessage);; return true; } return false; diff --git a/Mage/src/mage/abilities/effects/common/counter/AddCountersSourceEffect.java b/Mage/src/mage/abilities/effects/common/counter/AddCountersSourceEffect.java index ce83f345b3..f363807c0c 100644 --- a/Mage/src/mage/abilities/effects/common/counter/AddCountersSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/counter/AddCountersSourceEffect.java @@ -31,9 +31,11 @@ package mage.abilities.effects.common.counter; import mage.Constants.Outcome; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; +import mage.cards.Card; import mage.counters.Counter; import mage.game.Game; import mage.game.permanent.Permanent; +import mage.players.Player; /** * @author BetaSteward_at_googlemail.com @@ -41,17 +43,25 @@ import mage.game.permanent.Permanent; public class AddCountersSourceEffect extends OneShotEffect { private Counter counter; + protected boolean informPlayers; public AddCountersSourceEffect(Counter counter) { + this(counter, false); + } + + public AddCountersSourceEffect(Counter counter, boolean informPlayers) { super(Outcome.Benefit); this.counter = counter.copy(); + this.informPlayers = informPlayers; setText(); } public AddCountersSourceEffect(final AddCountersSourceEffect effect) { super(effect); - if (effect.counter != null) + if (effect.counter != null) { this.counter = effect.counter.copy(); + } + this.informPlayers = effect.informPlayers; } @Override @@ -60,6 +70,12 @@ public class AddCountersSourceEffect extends OneShotEffect