mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-17 11:18:01 +00:00
- some other api with tgtPlayers
This commit is contained in:
@@ -122,7 +122,7 @@ public class AnimateAllEffect extends AnimateEffectBase {
|
|||||||
List<Card> list;
|
List<Card> list;
|
||||||
List<Player> tgtPlayers = getTargetPlayers(sa);
|
List<Player> tgtPlayers = getTargetPlayers(sa);
|
||||||
|
|
||||||
if ((tgtPlayers == null) || tgtPlayers.isEmpty()) {
|
if (!sa.usesTargeting() && !sa.hasParam("Defined")) {
|
||||||
list = game.getCardsIn(ZoneType.Battlefield);
|
list = game.getCardsIn(ZoneType.Battlefield);
|
||||||
} else {
|
} else {
|
||||||
list = new ArrayList<Card>(tgtPlayers.get(0).getCardsIn(ZoneType.Battlefield));
|
list = new ArrayList<Card>(tgtPlayers.get(0).getCardsIn(ZoneType.Battlefield));
|
||||||
|
|||||||
@@ -126,7 +126,7 @@ public class PumpAllEffect extends SpellAbilityEffect {
|
|||||||
}
|
}
|
||||||
|
|
||||||
list = new ArrayList<Card>();
|
list = new ArrayList<Card>();
|
||||||
if (!sa.usesTargeting()) {
|
if (!sa.usesTargeting() && !sa.hasParam("Defined")) {
|
||||||
for (final ZoneType zone : affectedZones) {
|
for (final ZoneType zone : affectedZones) {
|
||||||
list.addAll(game.getCardsIn(zone));
|
list.addAll(game.getCardsIn(zone));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ public class TapOrUntapAllEffect extends SpellAbilityEffect {
|
|||||||
validCards = AbilityUtils.filterListByType(validCards, sa.getParam("ValidCards"), sa);
|
validCards = AbilityUtils.filterListByType(validCards, sa.getParam("ValidCards"), sa);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!targetedPlayers.isEmpty()) {
|
if (sa.usesTargeting() || sa.hasParam("Defined")) {
|
||||||
validCards = CardLists.filterControlledBy(validCards, targetedPlayers);
|
validCards = CardLists.filterControlledBy(validCards, targetedPlayers);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user