external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Additional fix about tgtPlayers

Browse Source
This commit is contained in:
swordshine
2013-06-22 10:55:21 +00:00
parent 17f10cafbc
commit e7656f3be5
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java
View File

@@ -49,7 +49,7 @@ public class ChangeZoneAllEffect extends SpellAbilityEffect {
List<Player> tgtPlayers = getTargetPlayers(sa); List<Player> tgtPlayers = getTargetPlayers(sa);
final Game game = sa.getActivatingPlayer().getGame(); final Game game = sa.getActivatingPlayer().getGame();
if ((tgtPlayers == null) || tgtPlayers.isEmpty() || sa.hasParam("UseAllOriginZones")) { if ((!sa.usesTargeting() && !sa.hasParam("Defined")) || sa.hasParam("UseAllOriginZones")) {
cards = game.getCardsIn(origin); cards = game.getCardsIn(origin);
} else if (origin.contains(ZoneType.Library) && sa.hasParam("Search")) { } else if (origin.contains(ZoneType.Library) && sa.hasParam("Search")) {
// Search library using changezoneall effect need a param "Search" // Search library using changezoneall effect need a param "Search"

2
src/main/java/forge/card/ability/effects/TapAllEffect.java
View File

@@ -40,7 +40,7 @@ public class TapAllEffect extends SpellAbilityEffect {
final List<Player> tgtPlayers = getTargetPlayers(sa); final List<Player> tgtPlayers = getTargetPlayers(sa);
if (!sa.usesTargeting()) { if (!sa.usesTargeting() && !sa.hasParam("Defined")) {
cards = game.getCardsIn(ZoneType.Battlefield); cards = game.getCardsIn(ZoneType.Battlefield);
} else { } else {
cards = new ArrayList<Card>(); cards = new ArrayList<Card>();

2
src/main/java/forge/card/ability/effects/UntapAllEffect.java
View File

@@ -38,7 +38,7 @@ public class UntapAllEffect extends SpellAbilityEffect {
valid = sa.getParam("ValidCards"); valid = sa.getParam("ValidCards");
} }
if (!sa.usesTargeting()) { if (!sa.usesTargeting() && !sa.hasParam("Defined")) {
list = sa.getActivatingPlayer().getGame().getCardsIn(ZoneType.Battlefield); list = sa.getActivatingPlayer().getGame().getCardsIn(ZoneType.Battlefield);
} else { } else {
list = new ArrayList<Card>(); list = new ArrayList<Card>();