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

- Fixed targeted SpellAbility for some cards with counter effect (please review)

Browse Source
This commit is contained in:
swordshine
2013-08-09 07:39:50 +00:00
parent b4efa372b2
commit 555a8bfed7
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/card/ability/AbilityUtils.java
View File

@@ -997,6 +997,8 @@ public class AbilityUtils {
if (instanceSA != null) {
sas.add(instanceSA);
}
} else {
sas.add(targetSpell);
}
}
}

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

@@ -35,10 +35,6 @@ public class ChangeZoneAllEffect extends SpellAbilityEffect {
public void resolve(SpellAbility sa) {
final ZoneType destination = ZoneType.smartValueOf(sa.getParam("Destination"));
final List<ZoneType> origin = ZoneType.listValueOf(sa.getParam("Origin"));
if(origin.contains(ZoneType.Library) && sa.hasParam("Search")) {
sa.getActivatingPlayer().incLibrarySearched();
}
List<Card> cards = new ArrayList<Card>();
@@ -56,7 +52,6 @@ public class ChangeZoneAllEffect extends SpellAbilityEffect {
// Search library using changezoneall effect need a param "Search"
if (sa.getActivatingPlayer().hasKeyword("LimitSearchLibrary")) {
for (final Player p : tgtPlayers) {
cards.addAll(p.getCardsIn(origin));
cards.removeAll(p.getCardsIn(ZoneType.Library));
int fetchNum = Math.min(p.getCardsIn(ZoneType.Library).size(), 4);
cards.addAll(p.getCardsIn(ZoneType.Library, fetchNum));
@@ -68,7 +63,7 @@ public class ChangeZoneAllEffect extends SpellAbilityEffect {
}
}
}
if (origin.contains(ZoneType.Library) && sa.hasParam("Search") && !sa.getActivatingPlayer().hasKeyword("CantSearchLibrary")) {
List<Card> libCards = CardLists.getValidCards(cards, "Card.inZoneLibrary", sa.getActivatingPlayer(), source);
List<Card> libCardsYouOwn = CardLists.filterControlledBy(libCards, sa.getActivatingPlayer());