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

fix advance filter for adventure and flip

Browse Source
This commit is contained in:
Anthony Calosa
2021-03-29 15:23:03 +08:00
parent d554a7ee97
commit 0b61ddaff7
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java
View File

@@ -17,9 +17,11 @@ import com.google.common.base.Predicate;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import forge.card.CardEdition; import forge.card.CardEdition;
import forge.card.CardRarity; import forge.card.CardRarity;
import forge.card.CardRules; import forge.card.CardRules;
import forge.card.CardSplitType;
import forge.card.CardType; import forge.card.CardType;
import forge.card.CardType.CoreType; import forge.card.CardType.CoreType;
import forge.card.CardType.Supertype; import forge.card.CardType.Supertype;
@@ -183,6 +185,19 @@ public class AdvancedSearch {
} }
@Override @Override
protected Set<String> getItemValues(PaperCard input) { protected Set<String> getItemValues(PaperCard input) {
CardSplitType cardSplitType = input.getRules().getSplitType();
//allow deck editor to find Adventure and Flip
if (cardSplitType == CardSplitType.Adventure || cardSplitType == CardSplitType.Flip) {
if (input.getRules().getOtherPart() != null) {
Set<String> subtypes = new HashSet<>();
for (String subs : input.getRules().getOtherPart().getType().getSubtypes()) {
subtypes.add(subs);
}for (String subs : input.getRules().getMainPart().getType().getSubtypes()) {
subtypes.add(subs);
}
return subtypes;
}
}
return (Set<String>)input.getRules().getType().getSubtypes(); return (Set<String>)input.getRules().getType().getSubtypes();
} }
}), }),