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

ConniveEffect - tidy up

Browse Source
This commit is contained in:
Northmoc
2022-05-24 06:51:15 -04:00
parent 34c19db4c2
commit c7fdab7996
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
forge-game/src/main/java/forge/game/ability/effects/ConniveEffect.java
View File

@@ -65,12 +65,7 @@ public class ConniveEffect extends SpellAbilityEffect {
}
for (final Player p : controllers) {
CardCollection connivers = new CardCollection();
for (Card c : toConnive) {
if (c.getController() == p) {
connivers.add(c);
}
}
CardCollection connivers = CardLists.filterControlledBy(toConnive, p);
while (connivers.size() > 0) {
GameEntityCounterTable table = new GameEntityCounterTable();
final CardZoneTable triggerList = new CardZoneTable();
@@ -84,14 +79,12 @@ public class ConniveEffect extends SpellAbilityEffect {
p.drawCards(num, sa, moveParams);
CardCollectionView dPHand = p.getCardsIn(ZoneType.Hand);
dPHand = CardLists.filter(dPHand, CardPredicates.Presets.NON_TOKEN);
if (dPHand.isEmpty() || !p.canDiscardBy(sa, true)) { // hand being empty unlikely, but just to be safe
CardCollectionView validCards = p.getCardsIn(ZoneType.Hand);
validCards = CardLists.filter(validCards, CardPredicates.Presets.NON_TOKEN);
if (validCards.isEmpty() || !p.canDiscardBy(sa, true)) { // hand being empty unlikely, just to be safe
continue;
}
CardCollection validCards = CardLists.getValidCards(dPHand, "Card", p, host, sa);
int amt = Math.min(validCards.size(), num);
CardCollectionView toBeDiscarded = amt == 0 ? CardCollection.EMPTY :
p.getController().chooseCardsToDiscardFrom(p, sa, validCards, amt, amt);