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

Merge branch 'fixCards' into 'master'

Browse Source 
Update more cards with ValidSA

See merge request core-developers/forge!3804
This commit is contained in:
Hans Mackowiak
2021-02-12 13:22:41 +00:00
parent 23cdccc479 d08a64bb69
commit 6ed3f8ab3e
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java
View File

@@ -1,7 +1,6 @@
package forge.game.ability.effects;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
@@ -149,14 +148,13 @@ public class PlayEffect extends SpellAbilityEffect {
if (sa.hasParam("ValidSA")) {
final String valid[] = {sa.getParam("ValidSA")};
final Iterator<Card> itr = tgtCards.iterator();
while (itr.hasNext()) {
final Card c = itr.next();
final List<SpellAbility> validSA = Lists.newArrayList(Iterables.filter(AbilityUtils.getBasicSpellsFromPlayEffect(c, controller), SpellAbilityPredicates.isValid(valid, controller , c, sa)));
if (validSA.size() == 0) {
itr.remove();
List<Card> toRemove = Lists.newArrayList();
for (Card c : tgtCards) {
if (!Iterables.any(AbilityUtils.getBasicSpellsFromPlayEffect(c, controller), SpellAbilityPredicates.isValid(valid, controller , c, sa))) {
toRemove.add(c);
}
}
tgtCards.removeAll(toRemove);
if (tgtCards.isEmpty()) {
return;
}