diff --git a/Mage.Sets/src/mage/cards/a/Anthroplasm.java b/Mage.Sets/src/mage/cards/a/Anthroplasm.java index f90edce634c..c42e0f42d73 100644 --- a/Mage.Sets/src/mage/cards/a/Anthroplasm.java +++ b/Mage.Sets/src/mage/cards/a/Anthroplasm.java @@ -53,7 +53,7 @@ import mage.game.permanent.Permanent; public class Anthroplasm extends CardImpl { public Anthroplasm(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}{U}"); this.subtype.add(SubType.SHAPESHIFTER); this.power = new MageInt(0); @@ -65,7 +65,7 @@ public class Anthroplasm extends CardImpl { Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AnthroplasmEffect(), new ManaCostsImpl("{X}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); - + } public Anthroplasm(final Anthroplasm card) { @@ -80,12 +80,12 @@ public class Anthroplasm extends CardImpl { class AnthroplasmEffect extends OneShotEffect { - AnthroplasmEffect ( ) { + AnthroplasmEffect() { super(Outcome.Benefit); - staticText = "Remove all +1/+1 counters from Anthroplasm and put X +1/+1 counters on it"; + staticText = "Remove all +1/+1 counters from {this} and put X +1/+1 counters on it"; } - AnthroplasmEffect ( AnthroplasmEffect effect ) { + AnthroplasmEffect(AnthroplasmEffect effect) { super(effect); } diff --git a/Mage/src/main/java/mage/cards/CardImpl.java b/Mage/src/main/java/mage/cards/CardImpl.java index b7914738780..2215ea496a2 100644 --- a/Mage/src/main/java/mage/cards/CardImpl.java +++ b/Mage/src/main/java/mage/cards/CardImpl.java @@ -27,6 +27,11 @@ */ package mage.cards; +import java.lang.reflect.Constructor; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; import mage.MageObject; import mage.MageObjectImpl; import mage.Mana; @@ -48,12 +53,6 @@ import mage.util.SubTypeList; import mage.watchers.Watcher; import org.apache.log4j.Logger; -import java.lang.reflect.Constructor; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.UUID; - public abstract class CardImpl extends MageObjectImpl implements Card { private static final long serialVersionUID = 1L; @@ -669,7 +668,9 @@ public abstract class CardImpl extends MageObjectImpl implements Card { @Override public void removeCounters(Counter counter, Game game) { - removeCounters(counter.getName(), counter.getCount(), game); + if (counter != null) { + removeCounters(counter.getName(), counter.getCount(), game); + } } @Override