diff --git a/Mage.Sets/src/mage/sets/newphyrexia/MycosynthFiend.java b/Mage.Sets/src/mage/sets/newphyrexia/MycosynthFiend.java index fe6a4d5244d..bded028d9b5 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/MycosynthFiend.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/MycosynthFiend.java @@ -37,6 +37,7 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; +import mage.abilities.dynamicvalue.common.OpponentsPoisonCountersCount; /** * diff --git a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianSwarmlord.java b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianSwarmlord.java index fe52b84a69f..2c47ca3b0b7 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianSwarmlord.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/PhyrexianSwarmlord.java @@ -28,22 +28,16 @@ package mage.sets.newphyrexia; import mage.MageInt; -import mage.abilities.Ability; import mage.abilities.common.OnEventTriggeredAbility; -import mage.abilities.dynamicvalue.DynamicValue; -import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.keyword.InfectAbility; import mage.cards.CardImpl; import mage.constants.CardType; import mage.constants.Rarity; -import mage.counters.CounterType; -import mage.game.Game; import mage.game.events.GameEvent.EventType; import mage.game.permanent.token.InsectInfectToken; -import mage.players.Player; +import mage.abilities.dynamicvalue.common.OpponentsPoisonCountersCount; -import java.util.Set; import java.util.UUID; /** @@ -76,33 +70,3 @@ public class PhyrexianSwarmlord extends CardImpl { } } -class OpponentsPoisonCountersCount implements DynamicValue { - - @Override - public int calculate(Game game, Ability sourceAbility, Effect effect) { - int amount = 0; - Set playerList = game.getOpponents(sourceAbility.getControllerId()); - for (UUID playerUUID : playerList) { - Player player = game.getPlayer(playerUUID); - if (player != null) { - amount += player.getCounters().getCount(CounterType.POISON); - } - } - return amount; - } - - @Override - public DynamicValue copy() { - return new OpponentsPoisonCountersCount(); - } - - @Override - public String toString() { - return "1"; - } - - @Override - public String getMessage() { - return "poison counter your opponents have"; - } -} diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/OpponentsPoisonCountersCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/OpponentsPoisonCountersCount.java new file mode 100644 index 00000000000..8851841caa2 --- /dev/null +++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/OpponentsPoisonCountersCount.java @@ -0,0 +1,42 @@ +package mage.abilities.dynamicvalue.common; + +import mage.abilities.Ability; +import mage.abilities.dynamicvalue.DynamicValue; +import mage.abilities.effects.Effect; +import mage.counters.CounterType; +import mage.game.Game; +import mage.players.Player; + +import java.util.Set; +import java.util.UUID; + +public class OpponentsPoisonCountersCount implements DynamicValue { + + @Override + public int calculate(Game game, Ability sourceAbility, Effect effect) { + int amount = 0; + Set playerList = game.getOpponents(sourceAbility.getControllerId()); + for (UUID playerUUID : playerList) { + Player player = game.getPlayer(playerUUID); + if (player != null) { + amount += player.getCounters().getCount(CounterType.POISON); + } + } + return amount; + } + + @Override + public DynamicValue copy() { + return new OpponentsPoisonCountersCount(); + } + + @Override + public String toString() { + return "1"; + } + + @Override + public String getMessage() { + return "poison counter your opponents have"; + } +}